Check exact matches before splitting

* if the supplied name contains '_and_' or '_or_' we should check
  if it exists before splitting and checking the parts, this way we
  handle 'terms_and_conditions' as well as pairs of fields like
  'name_and_email'.
Merge pull request #449 from joeyates/master

Allow attributes containing `and` or `or` by checking exact matches before splitting.