[tuhopuu-devel] State of the merge

[Chris Want]

This merge wasn't completely smooth, but went
better than I had thought it would.

Basically, the transform stuff caused most of the
conflicts. I am operating on the assumption that
work on this will continue only in bf-blender, and
so whenever there was some ambiguity about what
code to choose, I chose the version from bf.

Please compile and test!

Chris