Merge pull request #6 from areynold/DR1-testing

Many small config changes
Moving test config to permanent home
Merge remote-tracking branch 'upstream/DR1-testing' into DR1-testing
Cleaning up test config files