Rename XXX comments with TODO:

Picks these up in `rake notes` and adds semantic meaning
Merge branch 'replace-xxx-todo' into rails-3-develop