pep8
Merge pull request #11 from astrofrog/pep8

PEP8