pep8 cleanup
Merge pull request #47 from dimagi/cleanup

pep8 cleanup