Fixes templatetags namespace collision
Merge branch 'master' of github.com:benjaminjkraft/zscore