Trying to fix version problem for jenkins
Merge pull request #125 from esheffield/master

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