Which brings me to this tip: you can turn on vi keyboard shortcuts for your terminal (either Terminal or iTerm) by adding the following line to your ~/.profile file:
set -o vi
Now, you can happily use that vi knowledge that you can't get rid of otherwise. If you're muscles can't remember the keystrokes, you can refresh your memory here.