we might be treeing now
Merge branch 'master' of https://github.com/craigthelinguist/knightcapital