Some TODO items.
Merge branch 'master' of github.com:chriswailes/kalkin

Conflicts:
	TODO.md