Add new mirage packages that do not require OPAM switching to operate

Fix up previous constraints as appropriate