Update packages and init.el
Merge branch 'master' of https://github.com/noprompt/matilde

Conflicts:
	emacs.d/noprompt-evil.el