updated configs
Update emacs config, jabber, notmuch, jedi
Merge branch 'master' of github.com:jagguli/dotemacs

Conflicts:
	emacs.el