Lowered timeouts on HAProxy
Merge branch 'master' of github.com:arguslab/ancor-puppet