Changed config file to match M3
Changed to make errors more understandable
Merge branch 'master' into milestone3
Alpha of milestone 3 compliant esb
Merged milestone 3 into eecg