feature/rowland-config-update 

This PR is to update the main config file with Rowland's changes. Basically, I sent Rowland the config, he made some changes, and now I'm updating it.