adds homebrew bash completion loading
sets up to use MacVim version of vim if available
removes some EPD python stuff, adds heroku toolbelt
merge conflict
merges in ssh agent stuff
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'master' into osx
Merge branch 'zsh' into osx
updates zshrc with vim alias and path stuff
merge conflicts in zshrc