Merge branch 'omake-mode' of github.com:seanmcl/opam-repository into omake-mode

Conflicts:
	packages/omake-mode.1.1/opam
Update to omake-mode for ocaml 4.01
Merge branch 'omake-mode'