Getting ready for changes

Gonna take me a little longer to push updates as I have to create vector
files for the banners and such
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	index.html