Merge remote-tracking branch 'devel/vcsDV3D-uvcdat-integration' into vcsDV3D-uvcdat-integration-updated

Conflicts:
	CMake/cdat_modules_extra/ESMF_install_step.cmake.in
	CMake/cdat_modules_extra/ESMF_make_step.cmake.in
Merge branch 'vcsDV3D-uvcdat-integration-updated'
Merge branch 'add_travis'
Merge branch 'add_readme'
Merge branch 'add_readme'
Fixed travis for uvcdat/master
Merge remote-tracking branch 'origin/fix_travis_for_master' into devel-master