Python 2 support
Bump version, update README.md and setup.py
Support old versions of Python 3
Remove stray testing code
fixed merge
mods and tests