add
Merge branch 'master' of https://github.com/sstrato/vim

Conflicts:
	.vimrc
	bundle/gist-vim
	bundle/vim-fugitive
	bundle/vim-rails