temp use github.com/timoschmidt/chef-solrcloud.git
Merge branch 'master' of https://github.com/AOEpeople/opsworks_solrcloud

Conflicts:
	Berksfile