Merge pull request #122 from newbery/edx-master

Make the tox tests work
add flake8 support
Merge pull request #123 from newbery/master

flake8 support
Upgrade pygments allowing us to remove the code we took from them to get python 3 compatibility