Merge pull request #477 from ndawe/master

[MRG] fix treatment of char in treetypes
Merge pull request #478 from ndawe/master

[MRG] preserve column and branch order from TreeModel definition