Merge pull request #177 from hughdbrown/master
authorSalim Fadhley <sal@stodge.org>
Fri, 11 Oct 2013 22:09:46 +0000 (15:09 -0700)
committerSalim Fadhley <sal@stodge.org>
Fri, 11 Oct 2013 22:09:46 +0000 (15:09 -0700)
Pep8 and pylint fixes to code


Trivial merge