Move edamame to ns1 and spinach to ns2

This should make it feasible to kill DNS on lettuce now. yay

[FIXED INFRA-19]