fix merge
Merge branch 'master' of github.com:luxflux/prezto

* 'master' of github.com:luxflux/prezto:
  netstat on osx alias
  use the trick of @thoughtbot to expand PATH with the binstubs
  use neovim instead of vim
  do not cache this stuff
  fix last git commit prompt part
  add time since last commit to prompt

Conflicts:
	runcoms/zpreztorc