quote quote quote
shiny new vims
aliases 'n shit
Merge branch 'master' of github.com:skimbrel/dotfiles

Conflicts:
	.gitmodules
	vimrc