Various text updates. Forgot to make a branch first (doh!)

Conflicts:
	index.md
Merge branch 'master' into gh-pages