Added a more suitable grammar for Mercury
Use atom/language-atom for the YAML grammar
Merge pull request #1885 from github/gjtorikian-patch-1

Use atom/language-atom for the YAML grammar
Merge pull request #1877 from sebgod/change-mercury-grammar

Added a more suitable grammar for Mercury