Use pre-order traversal when simplifying CondTree's.

Fixes #676.
Merge branch 'master' of https://github.com/manzyuk/cabal