Updated the read me with the TODO list.
Merge branch 'master' into gh-pages