Updated settings and urls to support django 1.4
Merge pull request #3 from fergalmoran/master

Updated to support django 1.4