Merge my local branch, bring back xmlrpc

Benjamin Mako Hill || Want to submit a patch?