Merge remote-tracking branch 'devel/129_fix_cmake_typos'

* devel/129_fix_cmake_typos:
  Renabling downloading sample data for dashboards and guarding tests.
  Fixing typo that causes extra downloads for dashboards.

Conflicts:
	CMake/dashboard/meryem.cmake
Merge remote-tracking branch 'devel/130_download_test_files'

* devel/130_download_test_files:
  Making the cmake variables more consistent.
  First step in enabling UV-CDAT testing data.
Changes for enabling POP reader testing in ParaView.
Adding in a test of the temporal statistics.
Merge remote-tracking branch 'devel/108_paraview_testing' into devel-master

Conflicts:
	CMake/dashboard/meryem.cmake