OCaml setup
Add abbrev stuff.
Merge branch 'master' of github.com:danbek/setup

Conflicts:
	dot-bashrc