Moving URL stuff up one level, reflecting Django 1.5 changes
Merge pull request #44 from jokull/master

Moving URL stuff up one level, reflecting Django 1.5 changes