Cleaned up Settings

A lot of recent issues have come from config-settings.php, I've done a
bit of work and tried to abstract some of the pain away.