fish stuff
Merge branch 'master' of https://github.com/lendle/dotfiles
remove prezto for a sec
added prezto back
updated prezto submod