Fixes #675, this allows handler config files to override the master config
Re #473, add in fixtures and verify no cpus are collecting over 100 per field and per total