evil surround
Merge branch 'master' of github.com:px0/dotfiles

Conflicts:
	emacs.d/user.el