Updates to config page
Merge branch 'master' of https://github.com/bwoodworth/Open-Source-Automation
missed from checkin
Merge branch 'pr/n67_matthewste'