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