support proper merging of nested conditionals
Merge pull request #33 from Matchbook/master

support proper merging of nested conditionals