Revert "Revert "upgrade to Django 1.7""

This reverts commit b8f0c44260697447f8440ee6e84047c1a9a9362d.