Font on work vm.
OCaml emacs support.
Merge branch 'master' of github.com:danbek/setup

Conflicts:
	dot-emacs.d/init.el