Merge branch 'master' of http://lair.fifthhorseman.net/~jrollins/git/monkeysphere