It seems like putting back the old spark plug wires fixed this. Guys that were fixing the head screwed up my wires! Doh...well, everything runs fine again.