updating .vimrc for fixing conque-term related bugs...
Merge branch 'master' of github.com:nerguri/vimrc

Conflicts:
	README.md