Fixing stuff and running builder.
Merge branch 'master' into gh-pages

* master:
  Fixing stuff and running builder.

Conflicts:
	index.html