Removing elasticsearch-s/p because it's now managed by the new puppet repo
Merge branch 'master' of github.com:ASCTech/Casanova-Puppet

Conflicts:
	classes/elasticsearch.pp