Added grep alias
Merge branch 'master' into mac