REF: moved to python 3
MNT: cleaned up some formatting (line breaks, tabs)
MNT: cleaned up some formatting (more line breaks)
Merge pull request #35 from phobson/py3k

Py3k: oof