pushing updates
Merge branch 'master' of https://github.com/jleonard/generator-leonard

Conflicts:
	app/templates/Gruntfile.js
	app/templates/docpad/docs-layout.html
	app/templates/install.sh