Further small adaptions to Python 2.7, Django 1.6 and current pip