fix env
fix quotes
fix path
add endpoint host mappings
remove dup settings
fix puppet file location
put back dns hack