more doc changes
Merge branch 'master' of https://github.com/infoscout/pymstr

Conflicts:
	docs/conf.py