modified:   .vimrc
Merge branch 'master' of https://github.com/FStephenQ/dotfiles

Conflicts:
	.vimrc

	modified:   .vimrc
	deleted:    .screenrc