Add watch script and minor changes to aliases and colors
Merge remote-tracking branch 'origin/master'