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