Updating to newest puppet config
Merge branch 'develop' of ssh://github.com/akvo/akvo-rsr into develop
Merge branch 'develop' of ssh://github.com/akvo/akvo-rsr into develop