cleanup and pep8
add a bunch of different filter properties
Merge pull request #2 from dimagi/cleanup

Cleanup