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
There is problem with `npm install` with current version

It's because of bad dependency in grunt-requirejs
https://github.com/asciidisco/grunt-requirejs/issues/77
Bower and Grunt websites added
Merge pull request #25 from jrmlstf/patch-1

Bower and Grunt websites added
Merge pull request #24 from soswow/patch-1

There is problem with `npm install` with current version
Merge pull request #3 from mrichard/master

Merge with upstream.