Python 3 compatibility and PEP8 cleanup (since I'm OCD)
Merge pull request #2 from brandonjschwartz/master

Python 3 compatibility and PEP8 cleanup (since I'm OCD)