This is what I did and it worked for me:
Clear cache and dalvik cache.
Flash latest CM 13 nightly.
Flash Caf temasek rom right after.
Reboot.
Enjoy!
P/S: I used TWRP 2.8.6.0
As long as the info on where to find you can be easily found in this thread then by all means do whatever you feel is more convinient for the development of the rom my man :highfive: