add filter classes
add simple calculator
generic fluff reindexer
normalize output to dict format
Merge pull request #38 from dimagi/reindex_commandline

generic fluff reindexer
Merge pull request #37 from dimagi/simplecalc

add simple calculator
Merge pull request #39 from dimagi/normalize_output

normalize output to dict format
Merge pull request #36 from dimagi/filter

add filter classes
Merge branch 'master' into parallel_index

Conflicts:
	fluff/management/commands/ptop_fast_reindex_fluff.py