Updated config.yml to support 2.2
Other 2.2 defaults in config.yml