refactored importers
Merge branch 'master' of https://github.com/tunacasserole/horizon