Merge gerbil fork into cmake branch

Y'know.