magit-diff-highlight-whitespace: use lazy match
Lazy match should be used to find trailing spaces.
Merge pull request #1373 from shigi/trailing-spaces

magit-diff-highlight-whitespace: use lazy match
magit-git-executable: except on windows, use just the name

Since f0186c88732e543d9487082405685fa0a2688b70 `magit-git-executable'
was set to the full path to the executable, which becomes problematic
when connecting to a remote repository using Tramp and the executable
is not installed in the identical location on that system.

On Windows keep using the full path, because here multiple "git.***"
are installed and it makes a big difference which is used.  I would
much rather have a handful of Windows users report that they cannot
use Magit remotely than to have many more users complain that "Magit
is nice, but soooooooo slow on Windows".

We could use different variable for local and tramp Git, I suppose.
But the proper way of testing that is `file-remote-p', and that is
to expensive to run over and over again.  And I don't like caching.
deal with yet another way Emacs can be installed on OS X
Merge branch 'master' into next

Conflicts:
	magit.el
magit-commit-assert: don't offer to stage if MERGE_MSG exists

Because doing so would likely mean staging unresolved conflicts.