vim modules
Merge branch 'master' of github.com:JamieEi/env

Conflicts:
	dotfiles/vimrc