Add user-defined functions and filters
Merge branch 'master' of https://github.com/luminousrubyist/dinosaur