Updated files to match Heroes
Merge branch 'master' of github.com:paulgrock/generator-bennett

* 'master' of github.com:paulgrock/generator-bennett:
  updated gruntfile and jshintrc
  updated package.json to newest modules
  Quote style fix
  Added JetBrains IDE files to gitignore
  Live reload will now detect changes to js files in sub-directories

Conflicts:
	app/templates/Gruntfile.js
	app/templates/_package.json
	app/templates/jshintrc
	app/templates/views/layout.jade
Merge pull request #5 from paulgrock/master

Updated files to match Heroes