use jedi again in vim
Merge branch 'master' of github.com:asmaps/dotfiles

Conflicts:
	gitconfig