Merge branch 'hotfix/vexxhost' into develop
changes to haproxy doc, vexxhost and toolbelt docs
Merge branches 'master' and 'develop' of http://github.com/cloud66/help