Add word warp settings.
Merge branch 'master' of https://github.com/nuklly/emacs.d

Conflicts:
	init.el
	nuk/init-nuk-editing-utils.el