Upgrade to DJango 1.7