use line numbers in shell mode
Merge branch 'master' of github.com:dhellmann/emacs-settings