Rename XXX comments with TODO:

Picks these up in `rake notes` and adds semantic meaning
Use 2 (not 4) spaces for indentation.