Switch template tags to use hyphens instead of underscores
Merge pull request #122 from infosiftr/hyphens

Switch template tags to use hyphens instead of underscores