changes for python
modified yasnippet setting
Merge branch 'master' of github.com:notani/.emacs.d

Conflicts:
	config/packages.el