Bring demo up to django 1.6

Minimal changes necessary to get the demo working with Django 1.6. I could probably have gone farther to adjust the file system layout, but wanted to err on the side of less change.