Whitespace: \t to 4 spaces
Package scoped logger
Use new-style classes
PEP8isms for singleton comparison
Merge remote-tracking branch 'gh-callan/cleanup'