Make sure the fish folder exists
Merge branch 'master' of github.com:kmcphillips/dotfiles