fix imports and whitespace
Merge branch 'master' of github.com:straemer/PowerGrid