Pull out more logic into a separate method. Make it easier to unit test
Fix the case where there's a blank line
Merge branch 'Lists'

Conflicts:
	RichTextEditor/Source/RichTextController.m