Don't use TERM=gnome-256color under gnome-terminal, causes more grief than it is worth...
Merge branch 'master' of github.com:joshuar/bash-shell-config