Update gitignore for PHPStorm
Update magento version and other minor improvements

* Include the bowerrc file to put components under the js/vendor directory
Merge branch 'master' of github.com:jshtylr/generator-magento

Conflicts:
	app/index.js