version up
Merge branch 'master' of https://github.com/mrichard/generator-marionette
fix issue with latest yeoman generator
Merge branch 'master' of https://github.com/mrichard/generator-marionette
update version
remove handle bars shim