Major restructuring of the Psi tree
Major restructuring to account for the more advanced parsing of if
statements. Restructuring required major changes in how the brace matching
works to account for all the new tokens. Minor changes to folding too.