vimrc.local for spf13
Merge remote-tracking branch 'origin/master'
tweak