Implemented improved default naming (closes #2609)
Updated input files for new default naming scheme (#2609)
Merge pull request #2969 from aeslaughter/file_base-2609

Output naming improved
Merge commit 'e7418425ddc59d04867a61a79b24ea8e6b6a2ff6'