Use new deconstruct from django 1.7 migrations
Remove on merge bug
Merge pull request #17 from mociepka/master

Django 1.7 compatibility