Merge branch 'master' of git://github.com/mwilliams/oh-my-zsh into mwilliams/master

aliases.zsh

@@ -12,7 +12,16 @@ alias ...='cd ../..'
 alias _='sudo'
 
 #alias g='grep -in'
+
 alias g='git'
+alias gst='git status'
+alias gl='git pull'
+alias gp='git push'
+alias gd='git diff | mate'
+alias gc='git commit -v'
+alias gca='git commit -v -a'
+alias gb='git branch'
+alias gba='git branch -a'
 
 alias history='fc -l 1'