Allow predicates combinations to include functions
Merge pull request #98 from alphagov/combine_function_predicates

Allow predicates combinations to include functions