updated esmf/esmp
build dirs where wrong
Merge remote-tracking branch 'devel/update_esmf' into devel-master