Convert text to match for Elasticsearch 1.0 (bug 971801)
Make S's value_dict Elasticsearch 1.0 compatible

With Elasticsearch 1.0, any time you query with `fields` the values
always come back as lists. This assumes this everywhere and forces it
for Elasticsearch < 1.0 to be consistent.