updated hiway-site.xml
Merged .kitchen.yml files