Updates to setup.py to try to get installs to work properly.