Update build tools, finish up merge