Taking out as much pep8 violations as possible.
Merge pull request #1281 from lowks/master

pep8 violations removal