[CGIV-112] - Tidy cookbooks and berkshelf file

This will need [mycg::varnish] recipe to be run if varnish is used.