Add svn-merge-branch to svn script. vimrc update
Merge
Merge branch 'master' of github.com:tmallen/dotfiles