Fix all pylint errors except TODOs
Merge pull request #260 from cpennington/clean-up-pylint

Fix all pylint errors except TODOs