Fixed imports, cleaned up re: pylint
Something
Merge pull request #1 from mpharrigan/mph

pylint