pep-8-ify
Merge pull request #3 from JustinSGray/master

pep-8-ify