Updated ES data indexing script, cleaned up querying code and put service in travis for including ElasticSearch