Merge from Camilla's updates.
Added run_mpi.sh files.