Add disjunctive multi-constraints with |, refs #643, fixes #1342

I'd appreciate feedback on the operator, `|` or `||` or something else? BTW at the moment `,` (AND) has higher priority than OR, I think this makes most sense in this context, and I hope we can get away without full braces parsing and all, but if someone has feedback on that too feel free.