Move to ElasticSearch 1.2.4 and comment out query validator for now, see USERGRID-221.
More test fixes related to merge from master and previous serialization fix.
Merge branch 'pr/70' into two-dot-o