Sync changes to Mezzanine project template files
Merge branch 'master' of github.com:jaywink/kakaravaara