Add some extra config options, thanks @mattrobenolt
Add PyPI to the HAProxy config
Just hardcode in the config
Merge branch 'master' of github.com:python/psf-salt

Conflicts:
	salt/haproxy/config/haproxy.cfg.jinja