Change: Fix incorrect reference to private key, cleanups
Added various lexers to console and diff output
Merge pull request #617 from nickanderson/3.5-git-instruction-fix

Change: Fix incorrect reference to private key, cleanups