But full vi has been available from the cl with readline for a long time. Not quite as nice as athame, but very easy and serviceable.
If you are in vi mode (set -o vi, or your .inputrc is so configured), then on the command line press esc to get out of insert mode and into normal mode, then type v. A full vim editor will open in the terminal, with whatever you've typed so far.
Edit, :wq to execute the command. Delete the whole buffer and :wq if you don't want to execute anything.
This won't work anywhere but the cl I don't think, so the bit about python in athame is nice.