Fixed twig filter/functions namespacing
Merge branch 'development' of https://github.com/jameswestnz/branch into development