Simplify base packages
Merge branch 'master' of github.com:OCamlPro/opam-repository