Merge conflicts with upstream.
Misc. vim plugin updates
Misc. vim updates, bundles
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/bundle/bufkill.vim
	vim/bundle/vim-markdown
	vim/bundle/vundle/spell/en.utf-8.add
	vim/bundle/vundle/spell/en.utf-8.add.spl
	vim/colors/railscasts.vim
	vim/vimrc