whoops, let's let nginx do the gzipping...
and undo the gitignore
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	.gitignore