Update for devimage
Merge branch 'master' of github.com:wfscheper/dotfiles into ws-devimage
Revert to vi keybindings