Updating to django 1.5
Merge pull request #26 from eparsons/master

Updated django