Re-add highlight.js, fix underlying .gitignore problem
WIP: Fade crap
Clean up fading messiness
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore