This is just getting annoying now.
Sorry, travis
Merge branch 'master' into develop
Merge branch 'cli' into develop. Fixes #16
Move license to readme
Convert readme to rst
Fix huge setup.py fail
I wonder if pypy works
Okay, pypy doesn't work
Add more classifiers
Add a changelog
Merge branch 'develop'