Added most of merging functionality. TODO comments should not have their timestamps reset.
Merge branch 'master' of https://github.com/sjzhu/typo