modified:   vimrc
	remap set paste to <leader>sp
Merge branch 'master' of https://github.com/kuntau/dotfiles

Conflicts:
	vimrc

	modified:   vimrc