Update for fish shell
Updated all vim plugins
Merge remote-tracking branch 'origin/master'