Merge remote-tracking branch 'devel/add_cdms2_test'
Merge remote-tracking branch 'origin/release'
Fixed two dock icons for Mac
xcode 5 (clang version 5) does not support -R flag
Merge branch '371_fix_two_dock_icons'
Merge remote-tracking branch 'devel/fix_cairo_build_xcode5'
Ensure pylibxml2 build finds libxml2 includes

pylibxml2 was using system includes for libxml2. Instead add include
directory in build tree to search path, so we pick up the version we
are building.
Added script to fix install names of the libraries
Removed unnecessary code
Merge remote-tracking branch 'devel/fix_install_names'
Added script to fix install names of the libraries
Disabled openmp when using clang 5
Merge remote-tracking branch 'devel/fix_esmf_openmp_xcode5'
Patch ESMP to allow loading of config from relative path

Allow ESMP to load configuration relative to the ESMP Python module
so they can be loading when installing. This is requred to allow
a "drag and drop" style install.
Use PYTHON_SITE_PACKAGES rather than GLOBing for module

Rather than GLOBing for ESMP_LoadESMF.py use the variable we
already have.
Merge branch 'esmp-config-fix' into release