Merge branch 'shanchen' of https://github.com/Marcello-Sega/espresso
Owen's fix for SHANCHEN
Fixed build system?
Added CXX mpi macrAdded CXX mpi macroo
minor fixes, need to commit pre-merge
fixed merge conflicts