Make Open MPI and Intel more generic

[mathomp4]

We need to make Intel + Open MPI possible for testing on Discover. This means two things:

1. The Intel image probably needs to be "two" images:
2. Intel "bare"
3. Intel + Intel MPI
4. The Open MPI needs to be compiler-generic.