Updated bash functions
Merge branch 'master' of github.com:sgmac/dotfiles
Added some aliases
Git aliases updated