Addtemplatelocations

Fixes to allow template overrides, newest rubocop fixes and modifying some chefspec matchers