Move back to a single builder

With the cucumber changes, we are fast enough to run everything on a single builder. Plus its confusing to figure out who failed what build when we split things up. We are currently using 3x3 builders, which blocks almost all of Travis's boxes. I would rather block 2-3 boxes for 10 minutes than all of them for 5.