Johnson Amendment repeal to be included in tax bill?