Quickfix for cartridge-dependencies packages
Merge branch 'add-openshift-origin-cartridge-dependencies' of github.com:andrewklau/puppet-openshift_origin into add-openshift-origin-cartridge-dependencies

Conflicts:
	manifests/init.pp
Merge pull request #338 from sdodson/add-openshift-origin-cartridge-dependencies

Add openshift origin cartridge dependencies

Going ahead with it as is. We can revisit different implementation details in the future if this turns out to be confusing to users.
Merge from previous changes