update docs
Merge branch 'master' of github.com:andrewpaulreeves/pyAOS

Conflicts:
	doc/source/conf.py