Exclude default options from pylintrc
Add back errorneously excluded Pylint options
Add back errorneously excluded Pylint options
Merge branch 'short-pylint'