tweaks to haproxy template to make it...you know, work
Added PollingDiscoverer, refactored EC2 to use it.