Freshly merged

I took my latest version, and re-did some of the history so that it's a merge directly with your current master. This has the same effective content as "merged" did, but cleaned up (all the merge fixes included in the merge commit, now) and based directly on your master, not on a git-filter-branch version, so it can be merged.

Hopefully this helps to further https://github.com/Oberon00/luabind/issues/10 - since this effectively resolves all differences to get the combination of our changes applied.