refactor to make .kitchen.yml DRY
add missing recipe
fix up server names