cleanups
Merge branch 'master' of git@github.com:mathielen/import-engine.git