Type merging functionality, Default timestamps, and a few other tweaks
Merge branch 'master' of https://github.com/somerandomsequence/falling-fruit