Change to new-style url tags in templates
Merge branch 'master' of github.com:pdc/spreadsite