Add annotations for rake FIXME, TODO, OPTIMIZE support
Merge branch 'master' of https://github.com/cdlib/shortcake