Fish config
Merge branch 'master' of github.com:joakin/dotfiles
fixed permissions in some scripts
Fish config