gets haskell-mode from elpa instead of el-get
assoc cljs files with clojure-mode
Merge remote-tracking branch 'origin/master'

Conflicts:
	init.el