Fix setup.py
Bump version number
Merge pull request #40 from edx/dev

Dev