Adds glo; glp (arg)

* glo := git log --oneline
* glp := git log --pretty=arg
Resolving conflict with merge of #1058
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh