Cleanup of imports
Merge branch 'master' of https://github.com/killrweather/killrweather