Fix typo in custom filter documentation

This fixes one of the issues reported in schmittjoh/twig.js#82
Add regression test for schmittjoh/twig.js#64
Port Twig's "merge" filter