Fixed yeoman mistakes
Merge branch 'master' of https://github.com/maswhitaker/mason-github-page

Conflicts:
	.jshintrc
	app/index.html
	app/scripts/main.js
	app/styles/main.scss
	bower.json
	gulpfile.js
	package.json
	test/bower.json