Moving a few things around.

Also axe south for django 1.7