Improve split handling
Install screen and tmux
Merge branch 'master' of github.com:davidjb/dotfiles

Conflicts:
	NOTES.rst