Backport updates to git integration
Passphraseless key generation
Correct files to edit for pulling masterfiles from git
Merge pull request #120 from nickanderson/3.5

Backport updates to git integration