Merge pull request #1435 from OCamlPro/cudf-universe

Fixes keep-build-dir in switch commands, and adds opam config cudf-universe
More info in 'opam config cudf-universe'