Added python plugins to vim.
Merge branch 'master' of https://github.com/typhooncamel/dotfiles

Conflicts:
	.vimrc