changes
Merge branch 'master' of https://github.com/amaloz/emacs-config

Conflicts:
	config/ocaml.el