House panel OKs 'Castle Doctrine-plus' gun bill