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
Fix test by setting a large timeout

This is needed as downloading and extracting Magento could take a while
so I've just a large timeout. Improvements welcome
Added option for creating a design package
Use grunt-php to have a server setup
Add support for compass and the watch task
Update version
Update README.md
Merge branch 'master' of github.com:/josh-taylor/generator-magento
Update README.md
Update package.json
Add Travis-CI YML file
Merge branch 'master' of github.com:/josh-taylor/generator-magento
Update README.md
Update travis build png for new branch
Include livereload into the Gruntfile
Add option for installing twitter bootstrap
Update README.md
Directories Magento requires to be writable are now writable

These are:
 - app/etc
 - media
 - var