Unfortunately, I didn't have as much time to devote to this merge as I would have liked, will try to fix things soon. The main big problem for me was unwrapper.c -- the tuhopuu version and the bf-blender version are so far apart I can't tell what code is the right way to go. I went with the tuhopuu versions for everything. Chris