Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:devin-c/oh-my-zsh
Bring back the 'l' alias