Removing a couple of TODOs that already have github issues.
Merge branch 'master' of github.com:jfly/gjcomps