Ensure EDITOR is set before allowing edit in ember init
Merge pull request #1090 from rondale-sc/ensure_editor_is_specified

Ensure EDITOR is set before allowing edit in ember init
Display message to user when diff cannot be applied cleanly