Updated Oh-My-ZSH and added new aliases

alias glp='git log --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset"'
alias glpd='git log --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset"'
alias glpg='git log --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset"'
Merge branch 'master' of github.com:arnlaugsson/dotfiles

Conflicts:
	zshrc