Updated setup.py for this branch.