Add only configure.py to pythonpath.
Fixup jedi completion.
Merge branch 'master' of github.com:hotgloupi/conf

Conflicts:
	vim/.vimrc