Initial commit
Update TODO and README
Deal with default github.com README conflicts