fixes to elasticsearch_service
Merge branch 'master' of https://github.com/jnoble/TeamAwesome