New funding bill unveiled as lawmakers work to avoid government shutdown