Only do the hack etc... if we're cloning
Merge pull request #254 from roydude/v1-train

Only do the hack etc... if we're cloning