Cleanup dependency tree

Replaced `core.incubator` usages with core equivalent. This change introduces a dependency an clojure 1.5. Not sure if this is fine (this explains failing tests).