Updates after git recovery

Git wouldn't run in previous install of Windows 7. Moved to win8.1 and
now integrating changes made during that time.