Adding .vimrc
Adding local vimrc, spf13 and before spf13 rc dotfiles
Merge remote-tracking branch 'origin/vim'