Iowa Legislation votes tax rise-- bill includes new school aid plan