Keep Jedi from overriding my C-c r keybinding

actually, I may have already done that.

anyway, now it's cleaner, and also I've removed some items from todo.txt.