Adding "test" target to Makefile - closes #2775
Peacock supports selecting outputs (#2781)
Changing an assert to an error - closes #2779
Merge pull request #2782 from idaholab/test_target

Adding "test" target to Makefile
Adding a test for penetration location with a meshed gap #2713
Merge commit '1bcce72ed850a971eb42d8eb29d1d37d170aef42'
Merge pull request #2783 from aeslaughter/peacock-2781

Peacock supports selecting outputs
Merge commit '1397db24919e8bdb9dadbb25103bae14711c7218'
Changing warnings to use output stream instead of error stream - closes #2422
Merge commit '15e0a8be80d988a9e6c37cb6b8ce2616b87cddad'
fixup peacock #2783
Merge pull request #2785 from permcody/stream_2422

Changing warnings to use output stream instead of error stream
Merge pull request #2784 from idaholab/max_qps

Changing an assert to an error
Merge commit '54b76925905bfb36c0d5a43f61e609b93c838e0b'
Merge commit 'd611ca6550b34ce75a7cd94adbe1b2225d62cd3b'
Merge commit '453886525e6cd68cc8c0035f4b4418106db481f0'