update .vimrc, customize tabstop for different filetype
Merge remote-tracking branch 'origin/master'