I seriously need to reconsider using pylint
Merge branch 'master' of github.com:criswell/meh

Conflicts:
	pylint/.pylintrc