I have made a version of the unofficial patch (v0.21), merging its enhancements with my own mod changes:
http://forums.civfanatics.com/showthread.php?p=7432738#post7432738