Merge pull request #2 from SpiderWebShow/master

Bunch of post-launch merges
Merge pull request #64 from gfscott/master

Merge pull request #2 from SpiderWebShow/master