Add fasd as submodule
Generalize zshenv
Merge remote-tracking branch 'pvc/master'
Merge