updated emacs config
Merge branch 'master' of github.com:jagguli/dotemacs

Conflicts:
	packs/core/init.el