Better error handling of malformed config file + fix config template file
Merge branch 'master' of https://github.com/n1ck3/sonar