switch to new url tag syntax
Merge branch 'master' into django-1.5

Conflicts:
	couchlog/templates/couchlog/dashboard.html
adding future url load
putting extends on top of template
Merge pull request #9 from dimagi/django-1.5

Django 1.5