Update fish config
Merge branch 'master' of github.com:bitwalker/dotfiles