a few more cosmetic updates
Fixed esc_flag bugs. Set esc_flag to FALSE on every legit exit, not just one.
Fixed merge conflict.

Merge remote-tracking branch 'swirldev/master'

Conflicts:
	R/swirl.R