Fixing if statements for Windows and OS X.
Merge branch 'master' into no-xargs
Also fixing 'git ... ||' statements.
Merge branch 'master' into no-xargs