Update travis to elasticsearch 1.2.1
Disable Thrift plugin as not compatible with es-1.2.1
Enable dynamic scripting as it is disable by default in 1.2.1
Fix IpRange tests by adding fix for CIDR check.
Fix FunctionScore tests as random scores are now rated in directly.
Merge master into es-1.2.1
Merge conflict with changes.txt
Merge branch 'es-1.2.1'