PEP8 fixes and 2to3 fixes to make it compatible with Python 3
Finalize 2to3 changes
Merge https://github.com/rubik/glim into dev
fix syntax error after merging pull request