Fixed some issues with the config and added a "Test" Config File
Merge remote-tracking branch 'origin/master'