ignore vim file.name~ backup files
permit HAproxy hosts to be IPv6 addresses
Merge pull request #772 from msimerson/haproxy-ipv6

permit HAproxy hosts to be IPv6 addresses
smtp_client: more reliable timeout parsing
Merge pull request #773 from msimerson/smtp_client2

smtp_client: more reliable timeout parsing
Merge pull request #771 from msimerson/vim-droppings

ignore vim file.name~ backup files
import watch into a clean branch

(so it merges cleanly with http-server)
add wss.url to config/watch.ini