Changed AND Filter to put "_cache" in appropriate spot.

Fixes issues with ES > 1.0.1.
Tested on 1.0.1 and 1.3.2
Fixed GeoBoundingBoxFilter to have the GeoFilterType in the correct
position.

Tested on ES 1.0.1 and 1.3.2
Bumping version