Merge branch 'master' of git+ssh://labs.riseup.net/~micah/public_git/monkeysphere