Fix install_requires (and other setup.py cleanup)
Merge branch 'develop' into release/1.2.0

Conflicts:
	setup.py