fix issue with latest yeoman generator
Merge branch 'master' of https://github.com/mrichard/generator-marionette