fixing hanging git prompt
adding to ubuntu prompt for server
Merge branch 'master' of github.com:klangley/dotfiles

* 'master' of github.com:klangley/dotfiles:
  adding project dir to PATH on osx