Don't need this crap at all anymore actually.
Merge branch 'master' into gh-pages

Conflicts:
	git-hooks/post-commit