More doc updates
Merge branch 'master' of https://github.com/DaneEveritt/PufferPanel

Conflicts:
	docs/index.rst