Added mpi to makefile
Reverted back to using MPI