[vim] remove pathogen
[zshrc] add port path, command names differ
[zsh] fix merge conflict
Merge branch 'osx' of github.com:bear24rw/dotfiles into osx