Clean up a bit
Make source compatible with Python 3 without 2to3
Prepare for PyPI release