First round of changes
Merge branch 'master' of https://github.com/coombsj/backbone.marionette.boilerplate