some configuration changes
Merge branch 'master' of github.com:Mytho/dotfiles

Conflicts:
	.screenrc