Look, I'm real sorry about all the branches, can you just take this t…

…hing already?

Clean up some pylint complaints (still WIP)

Re-cookiecutter because .py filename change