Merge pull request #26 from alxdarksage/develop

Some fixes to get Bridge working with config. Config tests fail when you...