Start changing things in setup.py
Merge branch 'master' into testing