Look in 'cmd' dir for git.exe on Windows

Fixes #587
Merge remote-tracking branch 'leif81/master'

Conflicts:
	src/utils/Setup.js
Allow empty commit when in merge stage.