Update .vimrc_local.vim (tracking #1485 a little)
Update .vimrc_local.vim indentation to match
Merge pull request #1622 from gittip/vimrc-updates

Update vimrc to match the state of #1485