Updating to latest version of develop (for now)
Updating to newest puppet config
Merge branch 'feature/puppet_integration' of ssh://github.com/akvo/akvo-rsr into feature/puppet_integration