fish syntax in vim
Merge branch 'master' of github.com:naggie/dotfiles