[refs #52] A few minor fixes to get bootstrapping working correctly
[refs #52] I have no idea why the puppet ssh key was removed...
Merge branch 'develop' of ssh://github.com/akvo/akvo-provisioning into develop
[refs #53] Adding a backupserver role
Merge branch 'master' of ssh://github.com/akvo/akvo-provisioning