Rename grep alias to ngrep (nicegrep)
Merge remote-tracking branch 'origin/master'