modified:   vimrc
Merge branch 'master' of http://github.com/whyreal/dotfiles

Conflicts:
	vimrc
	modified:   vimrc