Trim extra spaces from the HTML content so dirty bit is not set
Add newlines for the ToC so there are lsee conflicts
Merge branch 'github-refactor-oerpub' into phil-idempotent-save

Conflicts:
	scripts/views/workspace/content/aloha-edit.coffee