Keep editor flags

As per #130, my patch to handle values of `EDITOR` that are commands on `PATH` caused it to potentially erase any command-line flags that were also in `EDITOR`.  This fixes support for `EDITOR` values that are commands on `PATH` with flags.  It also adds regression tests for this scenario.