Merge branch 'master' into adam-steel
Cleans up content, some code, etc. Ready for first heroku push.
Merge branch 'adam-steel'