Commit Description: Adding screenrc and extra vim customization.
Merge branch 'master' of ssh://github.com/unomar/config

Conflicts:
	.vim/.netrwhist
	.vimrc