Enhanced C++ Editing.
Merge branch 'master' of https://github.com/maximaximal/VIMconfig

Conflicts:
	.vimrc
Fixed vimrc