updated docs
Merge branch 'master' into eayoungs

Conflicts:
	docs/build/doctrees/environment.pickle
	docs/generated/objects.inv
	docs/generated/searchindex.js