Add color scheme and ctag fix in vimrc
Fix merge