What didn't make it into the bipartisan gun control proposal?