Fix #146; fix all pep8 1.5.4 failures

Fixes #146