Update init.el
Merge branch 'refactor' of https://github.com/sevenpg/dotfiles into refactor

Conflicts:
	.emacs.d/init.el