Tweak zsh shell colour and add gimp shortcut to i3
Merge remote-tracking branch 'origin'