Corrected some merge issues, fixed another name clash that caused a segfault in tests, changed remaining PASO_MPI's to ESYS_MPI and added -std=c99 to gcc's default options.