changed screen defaults
Merge branch 'master' of github.com:drk1984/dotfiles

Conflicts:
	.bashrc