Merge pull request #36 from brendam/master

pep8 and pylint cleanups using  'flake8 --max-line-length=99 .'