Merge grammar PRs

[ThatXliner]

Have you checked for existing feature requests?

• [X] Completed

Summary

Merge https://github.com/atom/language-python/pull/313 and the like

Enter your response below:

See the PR contents

Any alternatives?

This modifies core grammars.

Other examples:

No response