no git plugin: alias gs conflict
Merge branch 'osx' of https://github.com/edwardtoday/dotfiles into osx

* 'osx' of https://github.com/edwardtoday/dotfiles:
  Update shellaliases