New bill seeks to end segregation of affordable housing from market rate units