add useful pluguins to .vimrc. and some changes.
fix for merge