a bunch of changes made while on vacation
Merge branch 'master' of https://github.com/ianreay/docs

Conflicts:
	source/index.rst