Remove shitty vim-slim repo
Added new vim slim
Re-added vim-surround
Merge branch 'osx'

Conflicts:
	.vim/bundle/vim-surround
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vim/bundle/vim-surround