Security fix

Atomic commits.  To sum up though:

Updated testing for Thode's changes
Updated Elasticsearch repo to use 1.3