Tweak setup.py to try and fix Jenkins and versioning weirdness