Edinburgh councillors have decided to expand Queensferry High School rather than build a new school in Kirkliston.