Add yaml stuff sort of
Remove evil
Merge branch 'master' of github.com:qlkzy/elisp

Conflicts:
	main.el