OS X improvments, using ctrp-cmatcher pluggin
Merge branch 'master' of https://github.com/rene-aguirre/vimfiles

Conflicts:
	vimrc