merging config files and handling server.* global options
Merge pull request #213 from girder/fix-config

Fixing issues with config files