Backport updates to git integration

Passphraseless key generation
Correct files to edit for pulling masterfiles from git