Merge README/TODO