Merge pull request #3606 from aeslaughter/peacock-2

Various enhancements to Peacock 2.0
Merge pull request #3920 from aeslaughter/peacock-2

Peacock 2