updated for pylint 1.0
JL
Resolved conflicts with master.