Improve readability and editability of setup.py

Conflicts:
	setup.py
Merge pull request #25 from jni/improve-setup

Improve readability and editability of setup.py