modify .vimrc
Merge branch 'master' of http://github.com/torash/dotfiles