Changed some machines to pull from ubuntu boxes instead of my homemade ones.