REally fix version and setup.py problems...