Slide updates
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.html
Content updates
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.html
Update slide URL
Merge remote-tracking branch 'origin/master' into gh-pages