fix in python-conf
Merge branch 'master' of github.com:erch/customenv

Conflicts:
	emacsdir/emacs.d/python-conf.el
Merge branch 'master' of github.com:erch/customenv
fix merge conflict