haproxy
Merge branch 'master' of github.com:davidx/vzcloud-riak

Conflicts:
	README.md
update