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
Separate py26 requirements from the others. If this gets more complicated we may need to make some directories
Place requirements into a directory to clean up root