blah
merged conflicts
Merge branch 'master' of github.com:JimGaylard/dotfiles

Conflicts:
	vimrc.bundles.local
	vimrc.local