Screen is lighter than tmux & supports scrolling, so introducing it as an option
Silence
Merge branch 'master' of github.com:xcthulhu/config-files
Ignoring emacs generated files
Lots of changes