Prepare puppet integration
Merge branch 'master' of https://github.com/SINTEF-9012/cloudml
First iteration on the integration with Puppet
Merge branch 'master' of https://github.com/SINTEF-9012/cloudml
Fix bug in the serialization and second iteration on puppet
Merge branch 'master' of https://github.com/SINTEF-9012/cloudml