Silly copy paste error from Google CDN fixed
Merge branch 'master' into gh-pages

Conflicts:
	about.html
	fall_2013.html
	in_progress.html
	index.html
	publications.html
	research.html
	talks.html
	teaching.html
	theses.html