Fixes zsh conf for ENS
Sets up emacs to find ocp-indent for OCaml 4.02 (not 4.01)
Comments .emacs functionalities not available in ENS
Use ledit instead of rlwrap with ocaml
Makes emacs use tuareg-mode for OCaml
Merge remote-tracking branch 'origin/master' into ens

Conflicts:
	.zshrc