Upgrade Elasticsearch
Merge pull request #665 from ppp0/issue-665

Upgrade elasticsearch to 1.3.1