Sync up VERSION file and setup.py version
Code cleanup

Encoding declarations added, flake8-ed, dead code removed, etc.