rpearce: Bumping timeout yet again, puppetmaster now takes longer than
240 seconds. We need to come back and revisit this insanity