Merge pull request #6 from john1king/templatetags

add template tag and filter