Turns two ERT files into one. Also fixes the ERT admin button being bork.
Disables the duplicate Response Team file. They've been unified.
Merge pull request #3388 from meyar/master

ERT fixes