Pull request to SmileyChris/master from fredpalmer/bug/django-1.7rc3-compat

Please pull these commits into SmileyChris/master.  Here is the latest commit message:

*"Running makemigrations with any Django 1.7rc3 project and easy_thumbnails would have a false positive that there were model changes not applied the 0001 and 0002 migrations for this project.  I have created fresh migrations from the latest Django and have separated them into their semantic equivalent 0001 and 0002 migrations.  This should allow a more painless upgrade for existing users of Django 1.7 and also keep new users from seeing the current false positive issue"*