Email settings (yay for not automatically committing new files)
Merge branch 'master' of github.com:SergeantHawke/Steampunk