pep8
Merge branch 'develop' of https://github.com/shirtsgroup/InterMol into develop

PEP8 tweaks