New python plugin for vim
Merge branch 'master' of https://github.com/joonazzz/dotfiles

Conflicts:
	emacs
	emacs~
	vimrc