This file will be moved to the dotvim repository
Merge branch 'master' of github.com:greg0ire/dotfiles

Conflicts:
	vimrc