Merge remote-tracking branch 'origin/fix_visit_hostname_bug' into next

* origin/fix_visit_hostname_bug:
  Removing dependency on hostname, also added omission to ExternalProject git fetch check
Merge remote-tracking branch 'origin/fix_openmpi_cuda5_build_error' into next

* origin/fix_openmpi_cuda5_build_error:
  disabled vampirtrace as OPENMPI errors with cuda 5
Now checks we are not in a subdirectory of sources
Merge branch 'uvcdat-bug202-builddirfix' into next
Fixed issue with cmake 2.8.10 not setting os_sysroot under mac
Merge branch 'uvcdat-bug207-fixcmake2.8.10bug' into next
got the regex right this time
Merge branch 'uvcdat-bug202-builddirfix' into next
Merge branch 'add_tests' into next
Merge remote-tracking branch 'origin/uvcdat-bug202-builddirfix' into next

* origin/uvcdat-bug202-builddirfix:
  Disallow in source build of any kind

Conflicts:
	CMakeLists.txt
Revert "Merge branch 'uvcdat-bug207-fixcmake2.8.10bug' into next"

This reverts commit 25e5a1efd5bed0923bae4329cfe89330ec8a4048, reversing
changes made to ab35ed1a40b226ae27af9ec1d3cfaf3e537d332c.
Merge remote-tracking branch 'origin/uvcdat-bug207-fixcmake2.8.10bug' into next

* origin/uvcdat-bug207-fixcmake2.8.10bug:
  Fixed issue with cmake 2.8.10 not setting os_sysroot under mac
Merge remote-tracking branch 'origin/bug1_fix_parallel_build' into next

* origin/bug1_fix_parallel_build:
  Fixed parallel build
Merge remote-tracking branch 'origin/bug1_fix_parallel_build' into next

* origin/bug1_fix_parallel_build:
  Make sure to reset the tag when switching branches
Merge branch 'bug1_fix_parallel_build' into next

* bug1_fix_parallel_build:
  Throw away local changes
Merge remote-tracking branch 'origin/bug1_fix_parallel_build' into next

* origin/bug1_fix_parallel_build:
  Bug: #1 Remove unnecessary fetch
Merge remote-tracking branch 'origin/update_krishna_cmake' into next

* origin/update_krishna_cmake:
  Turned on visit and esmf build for krishna
Adding update to External_VisIt to support new compile preprocessor definition within VisIt
Merge remote-tracking branch 'origin/fix_visit_compile_error' into next

* origin/fix_visit_compile_error:
  updating VisIt to handle new definition
Merge branch 'report-errors-to-console' into next