A couple pylint fixes
Merge pull request #447 from chadlung/master

A couple pylint fixes