Stopping git-upstream if command fails
Added some aliases
Merge branch 'master' of github.com:daviddavis/dotfiles