Moving URL stuff up one level, reflecting Django 1.5 changes