MAINT: PEP8
revert import six deletions
Merge pull request #185 from sciunto/pep8

MAINT: Minor edits to many files to conform with PEP8