Accepted Raymond's patch to combine mapping and keyword arguments, with slight modification.  Also, renamed the positional argument to '__mapping' to further reduce the chance of duplicate keyword arguments.
Accepted Raymond's patch to combine mapping and keyword arguments, with slight
modification.  Also, renamed the positional argument to '__mapping' to further
reduce the chance of duplicate keyword arguments.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator