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