Again and again
Merge branch 'master' of github.com:glejeune/.dotrc

Conflicts:
	_vimrc
	_vimrc.bundle