push vimrc to master
Merge branch 'master' of https://github.com/jwin/dotfiles into lm-ace-dev3