Updated .gitignore.
Added TODO list to README.
Merged in recent changes.