More pylint cleanups

2013-04-14, Gary Kramlich