Make PEP8 happier
Merge remote-tracking branch 'upstream/master'
Merge pull request #151 from chadlung/master

Make PEP8 happier
Merge branch 'master' of github.com:ProjectMeniscus/meniscus