Update version
rename the project to avoid name collsion on PyPi
Merge branch 'master' into 0.1.0-p0.7

Conflicts:
	setup.py