Deployment-related changes.
Merge branch 'master' of github.com:colons/ggj14
Merge branch 'master' of github.com:colons/ggj14