Basic clean up of config.xml
Merge pull request #1 from martinbi/master

Fixes