Senate Education Spending Bill Would Increase Aid for School Safety, Charters