* magit-key-mode.el (magit-key-mode-add-group): add missing arguments
  list when creating new group.
magit-insert-status-headers: Fix upstream info

Upstream status line was displaying commit information for HEAD.
Merge pull request #1347 from jtatarik/fix_add_group_arguments

magit-key-mode-add-group: add missing arguments list when creating new group
Merge pull request #1353 from kyleam/fix-upstream-status-header

magit-insert-status-headers: Fix upstream info
Merge branch 'master' into next

Conflicts:
	magit-key-mode.el
.gitignore: remove old patterns
.mailmap: new file

Previously .mailmap was generated by make to avoid an unnecessary file.
However some git commands take advantage of this file so while it isn't
necessary, it's still nice to have.
move obsolete alias definitions to eof

Well there is just one, but eof is where all those yet to be created
will go to.
capitalize Git and Magit in doc-strings and comments
assorted doc-string improvements
unconditionally add binding to git-commit-mode-map

Do not check whether `git-commit-mode-map' is
bound before adding a binding; it always is.
cleanup deprecated "marked commit" functionality
use --map and --mapcat when appropriate
use magit-bind-match-strings when appropriate

Also use `match-string' instead of `match-string-no-properties'
in a few cases because what doesn't exist also doesn't have to
be explicitly ignored.
remove unused magit-push-hook
remove magit-insert-ref-labels

Remove `magit-insert-ref-labels' and use `magit-format-ref-labels'
again.  The former was a kludge which was only needed while
`magit-insert' did not exist yet.
remove magit-get-remote, sanitize magit-{push,pull}

Until a short while ago Magit had very poor support for setting
the (remote or local) branch tracked by a branch.  Actually the
only way to do so was as a side-effect of `magit-push'.  We now
have proper support for setting the tracked branch and no longer
"need" `magit-push' and `magit-pull' to fallback to "origin" to
make dealing with this less painful (and potentially dangerous).

Nuke `magit-get-remote' which is where the now unnecessary
fallback was implemented.
remove unused magit-get-remote/branch
remove leftovers from rewrite functionality
magit-get-current-remote: do not fallback to "origin"

Return the configured remote, else nil.  Do not return "." which
represents the local repository, not a remote; and also do not
ever fallback to return "origin", just because that often (but
not necessarily) happens to be the most likely choice.