Update to include the Dajngo1.5 spookey lukey

changes to support Django 1.5