Update .vimrc

some programs(e.g. JavaScript, Ruby, shell) indent style is 2 space characters
Merge remote-tracking branch 'origin'