Merge pull request #580 from MrHash/master

Options for TermsFilter lookup
Added Cardinality aggregation
Fixed test for Cardinality aggregation
Added Cardinality aggregator to changes
Merge pull request #581 from r1pp3rj4ck/cardinality

Cardinality aggregation
Issue numbers to changes.txt added