Attempt at using url tag syntaxes valid across Django versions.
Merge branch 'master' into url_tag_syntax
Merge pull request #14 from ramiro/url_tag_syntax

Attempt at using url tag syntaxes valid across Django versions.