Merge pull request #172 from chadlung/master

Make PEP8 happier and remove some unused imports (very minor changes)