name cleanup
Merge branch 'master' of github.com:virtuecenter/Marionette-Boilerplate