Backups dir
Merge remote-tracking branch 'origin/master'
matchit plugin
set dir=~/.vim/backups
Update plugins
Latest update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules
	bundle/vim-scala