LGBT non-discrimination bill is back in the state House and Senate