Remove test.cfg (unused)
Merge branch 'master' into vinnie