Added alias to add coloring to grep by default
Merge remote-tracking branch 'origin/master'
Update coloring of prompt