More python 3 fixes
Merge branch 'master' of https://github.com/kennethreitz/clint