Add a couple of ycm options.
Add nicer pum color
Add auto-pairs
Configuration
Merge branch 'master' of github.com:datamadsen/.vim

Conflicts:
	.gitmodules
	vimrc