test...
Merge branch 'master' of https://github.com/mpursley/mpursley-dotfiles

Conflicts:
	.viminfo
deleted:    .viminfo