Split out Haskell and Clojure config
General cleanup