The City Council voted to give final OK to a plan that aims to boost development of market rate and affordable housing. Single family zones will be largely untouched.