added filtering and filter generator
updated documentation and simplified a couple overrides

Update README.md
# This is a combination of 3 commits.
# The first commit's message is:
# This is a combination of 2 commits.
# The first commit's message is:

fixed merge issue

# The 2nd commit message will be skipped:

#	Update README.md

# The 2nd commit message will be skipped:

#	Update README.md

# The 3rd commit message will be skipped:

#	Update README.md
merge
Merge pull request #4 from inigo-llc/api-filtering

added filtering and filter generator