add exec-path-from shell, fix: cucuber step find
Merge branch 'master' of github.com:YuriBratanov/emacs-cfg

Conflicts:
	.emacs