combine multiple filters on one table into a single and-ed filter
bugfixes in string parsing for merging filters
Merge pull request #135 from 18F/year_specific

combine multiple filters on one table into a single and-ed filter