Add vim-surround plugin
Disable shortcuts for window switch

There were conflicts when using Ctrl+J to remove linebreaks.
iTerm2 pref changes