Added endwise.vim
Updated iTerm prefs
Resolved conflict.