Hmm trying to resolve conflicts
Trying again
Merge branch 'master' of github.com:sairex/Simple-MacVim-Setup

Conflicts:
	.gitmodules