Merge pull request #6 from juliomenendez/feature/allow-custom-bower-directory

Adds option to rename the directory where Bower puts the components.
Merge pull request #1 from mrichard/master

Merges upstream.
Merge pull request #8 from juliomenendez/bugfix/grunt-build-empty

Fixes grunt build being empty. refs mrichard/generator-marionette#4
remove use strict from require config file
Merge pull request #2 from mrichard/master

Upstream changes
Removes unnecessary indentation in some templates.
Merge pull request #10 from juliomenendez/bugfix/removes-unnecessary-indentation

Removes unnecessary indentation in some templates.