Edited configs/.bashrc, remove grep --colour=auto
Merge remote-tracking branch 'origin/develop' into develop