Pull in renamed grammars
Merge pull request #676 from mozilla-services/issue_432

Pull in renamed grammars