Merge branch 'master' into brig_work

Author: Brig Bagley

src/Core/Command/GlobalCommandBuilderFromCommandLine.cc

@@ -68,7 +68,7 @@ using namespace SCIRun::Core::Commands;
     else
       std::cout << "HEADLESS MODE" << std::endl;  /// @todo obviously
 
-    if (!params->dataDirectory())
+    if (params->dataDirectory())
       q->enqueue(cmdFactory_->create(SetupDataDirectory));
 
     if (!params->inputFiles().empty())