added '*.bak' to .gitignore
added lib2to3 changes (from 2to3-3.3), plus python 2 fix