TODO items and a minor README fix.
Merge branch 'master' of github.com:rdadolf/phat