Modified grammars to include the language restructured text package
Fixing some merge conflicts