More trying to fix deleting
Merge remote-tracking branch 'origin/fix-backspace' into fix-delete

Conflicts:
	spec/support/editor_helper.rb
Add some more tests, and fix a bug with deletion
Fix undo/redo
Merge branch 'fix-delete' into feature-hover-dialog