Juggle versions to make everyone happy

Conflicts:
	setup.py