Adds ubuntu and tweaks setup for Clinkle.