Refactor
Merge branch 'master' of https://github.com/smaak/dimporter

Conflicts:
	src/dimporter/core.clj
Fixed conflict