Add Haskell and Clojure support + status bar always on.
Merge branch 'master' of github.com:alesk/dotfiles

Conflicts:
	vimrc2