Jul 18 2014
Jul 18 2014
Bring in some changes that I never got.

This was causing a huge mess in git.

Conflicts:
	index.html