Fix for command-t
If using fish, then set shell to sh
/bl to /bf
Use desert color scheme for console
Merge remote-tracking branch 'upstream/master'