Fixed problem when running peacock w/o input (closes #2781 and #2771)
Merge pull request #2797 from aeslaughter/peacock

Updating Peacock, again...