Merge pull request #254 from ndawe/master

MRG: preserve branch ordering in conversion to csv and in TreeBuffer