Added some new plugins.

- 2 plugins for git
- surrounding plugin
- autocmd to remove trailing spaces
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc