Update config files to include new category names from CBL
Merge branch 'master' of github.com:afgane/gvl_flavor