Fixed removing contrib dir in source builds
Merge branch 'v2.1'

Conflicts:
	scripts/dist/source/make-vistrails-src-nightly.py
	scripts/dist/source/make-vistrails-src-release.py
Updated for release 2.1.4
Updated hash for release 2.1.4
Merge branch 'v2.1'

Conflicts:
	dist/windows/custom/vistrails-gdal.iss
	dist/windows/custom/vistrailsx64-gdal.iss
	dist/windows/vistrails.iss
	dist/windows/vistrailsx64.iss
	scripts/dist/common/splash/splash.svg
	vistrails/gui/resources/images/vistrails_splash.png