Switch to enum
closes #4349
Added Scalar variables to output of TopResidualDebugOutput. Now they are included in the list if e.g. "[Debug] show_top_residuals=5 []" is given in the input file. This fixes #4402.
Added tests for inclusion of scalar variables into TopResidualDebugOutput
Small regression in Exodiff Tester
closes #4415
Skip tests for now (refs #3431 and #4407)
Merge pull request #4417 from aeslaughter/csv-broken

Skip tests for now
Add some template parameters for intel
(refs #3847)
Merge pull request #4401 from dasmy/TopResidualOutput_include_ScalarVariables

Include scalar variables in TopResidualDebugOutput
Merge pull request #4403 from permcody/pen_aux

Switch to enum
Fixing refinement issue on DisplacedMesh.

The issue is that mesh refinement is always followed by partitioning,
which requires recomputation of the Hilbert indices.  Since the
DisplacedSystem mesh is displaced inconsistently on different
processors, this can lead to inconsistent Hilbert keys being computed
on different processors, and ultimately an error during partitioning.

I tried several more or less complicated fixes for this, but the
simplest approach seems to be to simply 'undisplace' the
DisplacedSystem mesh prior to performing adaptive refinement, and then
let it be naturally 're-displaced' when the DisplacedSystem is
reinitialized.  This seems to work fairly well, and fixes the
PF_displaced_mesh_test in MARMOT, which was not working in parallel.
We can also undisplace the mesh using threads to help speed things up.

Refs #4404
Fixing a few small warnings in new Ouputs code.

Refs #3847, #1777
Merge pull request #4416 from permcody/test_harness_fix

Small regression in Exodiff Tester
Merge pull request #4418 from aeslaughter/intel

Add some template parameters for intel
Merge pull request #4421 from jwpeterson/fix_warnings

Fixing a few small warnings in new Ouputs code.
Merge pull request #4405 from jwpeterson/hilbert_displaced

Fixing refinement issue on DisplacedMesh.