Allow '.clang_complete' to form a ctrl-p root.
Merge branch 'master' of github.com:sattvik/vim-config

Conflicts:
	vimrc
Update various plugins