Open .cljs files with clojure-mode.
Merge branch 'master' of github.com:morphling/.dotfiles

Conflicts:
	emacs.d/haskell-mode-git