Deploy

OK, so the previous PR didn;t work due to duplicate defs. So the first commit is just reverting that.

The easiest way to avoid the duplicates is to extend the secure_freight script to handle both rsync files, and ssh deployment triggers. To do that, an if block is used to spot when we're updating "main" as opposed to any other freight define, and send a different resource set. Ugly, but workable.