update
Merge branch 'master' of https://github.com/mplourde/config

Conflicts:
	_vimrc