first almost-working handling of ands and ors, current problem is that I am including too many terms in the cartesian product in handle-combos
Merge branch 'master' of github.com:zenna/relax