Refactor for use-package
Merge branch 'master' of github.com:credmp/emacs-config

Conflicts:
	init.el