Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
	Gruntfile.js
	README.md
	_layouts/main.hbs
	js/script.js
	package.json