Refactor phrase rules a bit
Fixed all these by giving up on -del-

Using --deleted-text-- for now.

Need to keeping adding real world use cases.

Conflicts:

	test/phrase.tml
Fix for --x--
Merge branch 'master' of github.com:pdl/kwim-pm