pylint cleanup
Various config munging to get back content from correct directory