Update extension class to use underscore only in twig templates
Update config items to use single underscore
Merge branch 'master' of git://github.com/MESD/PresentationBundle