Initial django 1.7 support

Major 'contrib_' namespace cleanup