Merge branch 'master' of github.com:silinternational/chef-cookbooks
some refactoring and fixing metadata files