Merge branch 'hotfix/homepage-web-redirect'
Merge branch 'develop'
Removing Lauri's user
Adding Lynn to the www-edit group
Adding initial butler manifest structure
Initial FlowServices manifests
Vagrant config for a generic basebox
Removing unused deploy key
It is no longer necessary to specify virtualenv != 1.11 as there is now a fix to issue https://github.com/pypa/virtualenv/issues/524
Manifests to run and install services required to run butler
Removung unused deploy key
Tidying up old fabfile
Merge branch 'feature/butler-manifests' into develop
Merge branch 'develop' into feature/flow-services-manifests
FlowServices (renamed to flow report shim) now has all required manifests and keys
Updating RSR and PHP apps to use the new akvoapp::user type
Merge branch 'feature/flow-services-manifests' into develop
Updating Butler to use new akvoapp::user type
Fixing dependency for rsr installation
Homepage wordpress can now include configuration from /var/akvo/homepage/conf