Improved grep and zgrep aliases