Using just emaclient as editor if server-name is the default value.

Otherwise there are problem on windows (Closes #497)
There is still a problem with non standard server name on windows, but
this commit fix most common case.
fix travix make targets
Merge branch 'maint' of github.com:magit/magit into maint
fix travix make targets
magit-cmd-output: do not corrupt output

This fixes #544.  There is no reason why we would want to manipulate
git's output.  In the master and next branches something similar to
the code removed in this commit was used to have colorful graphs in
logs.  But doing it in `magit-cmd-output' was wrong and that has been
fixed in these branches also.
Fix bug where the wrong author info is used for committing

The author information is saved in the buffer-local variable 'process-environment' in
the log-edit buffer.
To reset its value, kill-local-variable must be called not after, but BEFORE
switching away from the log-edit buffer.

Otherwise, the old author information will be reapplied in the next commit that uses
the same log-edit buffer.
magit-cmd-output: do not corrupt output

This fixes #544.  There is no reason why we would want to manipulate
git's output.  In the master and next branches something similar to
the code removed in this commit was used to have colorful graphs in
logs, but in maint that isn't the case.
Merge pull request #641 from tarsius/maint

magit-cmd-output: do not corrupt output
Merge branch 'maint' of git://github.com/nonsequitur/magit into maint
README.md: put extensions in own section, push it down
README.md: link to up-to-date contributors list on github

Also prettify link to the owners team.
README.md: fix links
the magit-blame-mode test seems to cause issues in travis
merge fdl.texi into magit.texi

Previously fdl.texi was not actually included in magit.texi.  Instead of
including it this patch instead copies the license right into magit.text.
This removes clutter from the top directory, and replacing the text when
moving to a newer version of the license isn't really that much work.
quiet byte-compiler
add variable magit-font-lock-keywords

But don't do any magic to turn highlighting on automatically.
The doc-string contains instructions on how to do so, if desired.
Makefile: reduce output

Use the intended emacs command-line options instead of using
--eval FORM when the latter is not actually necessary.  When
it is necessary "pretty-print" FORM.
Makefile: don't mention flet is obsolete when compiling

There were many warnings when byte-compiling magit, that have been
ignored in the past.  I suspect that is because the output was to noisy
and the warnings were just overlocked.  This change reduces the noise
level by not mentioning that flet is obsolete (we know).  Combined with
the other noise reduction I have done in recent commits, I hope this
will allow us to catch and fetch compiler warnings sooner.
magit-insert-diff: enforce short diff style for submodules

Fix #553.
Merge branch 'hotfix/submodule-diff' into maint