Add Ocaml and Haskell modes.
Merge branch 'master' of github.com:pparkkin/emacs.d

Conflicts:
	init.el