jedi 2
Merge branch 'master' of https://github.com/labinxu/mydotemacs

Conflicts:
	confs/python-conf.el