Merge branch 'develop' into feature/puppet_compat_domain_routing
Partner site determination is now made by a series of regexps
Adding a MySQL root config
Fixing manage.sh script
Merge branch 'develop' into feature/puppet_compat_domain_routing
Adding private key parameter for rsr deployment (not needed for this environment but the provisioning will choke wihtout it)
Testing CI trigger
Merge branch 'develop' into feature/puppet_compat_domain_routing
Merge pull request #269 from akvo/develop

Develop
Fixing gitmodules URL to include .git suffix
Adding a small helper to ensure the provisioning script is run as root, useful when people have to rerun it manually
Updating vagrant environment config to match latest puppet config
Updating to newest version of puppet config
Adding a backup password
Merging latest changes from develop
Merge branch 'feature/puppet_compat_domain_routing' into develop