Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'forkro/master'
Removing the shift parameter for MAC OS less
Fixing the less variable dependant on the system being run
Adding some more global aliases