fixed timestamp bug and furthered reorg
Merge branch '0.9.0' of github.com:antler/caribou-core into 0.9.0