merging changes from epitome-mvc-assemble-handlebars-npm
Merge branch 'master' of https://github.com/assemble/assemble