Trying to speed things up while we have this gaiatest / restart issue going on.
Merge pull request #201 from roydude/v1-train

Trying to speed things up while we have this gaiatest / restart issue go...