Conflict resolutions on merge.  Using relative paths for EDBRAMS paths.mk, and added commas to gfortran compiler trap directives for ebi