Add 'elscreen' as submodule.
Merge branch 'master' of https://github.com/mather/dotfiles

Conflicts:
	.gitmodules