Omrf

A few small changes while attempting to get the new caller running at OMRF.

Biggest change is making MPI optional based on the n_cpu argument in 024a003