auto-publish to gh-pages using grunt.
update to latest version of grunt-gh-pages edit gruntfile
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore