Remove "set -o vi" from .bashrc.
Merge branch 'master' of github.com:mjkelly/config