EDITOR = vim
Merge branch 'master' of github.com:cam-xetal/dot_files

Conflicts:
	.vimrc