Set shell options and fix vi setting
Merge
Merge branch 'master' of github.com:scooter-dangle/dotfiles
Merge branch 'master' of github.com:scooter-dangle/dotfiles
merge from home tompy
Merge branch 'master' of github.com:scooter-dangle/dotfiles
Merge branch 'master' of github.com:scooter-dangle/dotfiles