pep8 cleanup
Merge remote-tracking branch 'upstream/master'
pep8 cleanup
Merge pull request #5 from stevendgonzales/master

pep8 cleanup from Hackathon