Merge pull request #449 from joeyates/master

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