Updated function score query to allow a filter as well as a query.
Updated function score query to accept filter per function
Updated version for next release
Added nested mappings in fields
Merge remote-tracking branch 'upstream/master'