Test and merge config branch

Created by: agraubert

It looks like all the configuration-related updates have been added, which gives us about a week to test before merging this into the master and deploying to the server