Make $EDITOR use --wait on Mac...this keeps certain programs happy.