Tweak jedi-vim settings somewhat
Add vim-unimpaired plugin
Merge branch 'master' of github.com:robgolding63/.vim

Conflicts:
	vimrc