Merge pull request #306 from edx/will/update-setup-py

Updated setup.py