remove hard configuration of coreos.dev as the hostname for the default site
Move cloud-config file directly in the right place
rename user-data to vagrantfile-user-data
add whiteline and comment at top of per-user section in haproxy-site
correct haproxy.cfg syntax
merge in generic-hostname branch
build up haproxy.cfg from three parts