Cleans up tree model. Adds BIP functionality to tree index.
Merge branches 'master' and 'john'