title: Circular dependency error when running migrations in Django 1.7c2
body: <p>I have been reading about django migrations at <a href="https://docs.djangoproject.com/en/1.7/topics/migrations/">https://docs.djangoproject.com/en/1.7/topics/migrations/</a>. I also reviewed the commits on the 1.7.x branch in github where I understand that this problem may have been solved. 
  Unfortunately I still get the error when running my migrations. The --fake option gives the same error. </p>
  
  <p>I have the following migrations:</p>
  
  <p>'people' app migration:</p>
  
  <pre><code>user@host$ /manage.py makemigrations people
  Migrations for 'people':
  0001_initial.py:
  - Create model Person
  - Create model Committee
  - Create model DepartmentGroup
  - Add field department_group to person
  - Create model MemberType
  - Add field member_type to person
  - Alter unique_together for person (1 constraint(s))
  - Create model PersonCommittee
  - Add field committees to committee
  - Add field committee to personcommittee
  - Add field member to personcommittee
  - Alter unique_together for personcommittee (1 constraint(s))
  - Create model Role
  - Create proxy model PersonArchive
  </code></pre>
  
  <p>'locations' app migration:</p>
  
  <pre><code>user@host$ ./manage.py makemigrations locations
  Migrations for 'locations':
  0001_initial.py:
  - Create model Building
  - Create model Institution
  - Create model InstitutionAddress
  - Add field institution to building
  - Add field address to institutionaddress
  - Add field institution to institutionaddress
  - Create model Room
  - Alter unique_together for room (1 constraint(s))
  </code></pre>
  
  <p>Now I run the migrations with</p>
  
  <pre><code>./manage.py migrate
  </code></pre>
  
  <p>and this is the error I get</p>
  
  <pre><code>django.db.migrations.graph.CircularDependencyError: 
  [('people', u'0001_initial'), ('locations', u'0001_initial'), 
  ('people', u'0001_initial')]
  </code></pre>
  
  <p>The full error can be viewed at: <a href="http://pastebin.com/jixK6Ve2">http://pastebin.com/jixK6Ve2</a></p>
  
  <p>My question is if there is still something in the django code that needs to be fixed, see fixed ticket: <a href="https://code.djangoproject.com/ticket/22932">https://code.djangoproject.com/ticket/22932</a>. If not, is there an option to split the migrations in 2 or more steps to avoid the circular dependency error?</p>