Removes old junk, and updates to django 1.4