Merge branch 'master' of http://micah.riseup.net/git/monkeysphere