merged migrations + updated changes.rst
fixed migrations
Merge pull request #496 from xliiv/merged-migrations

merged migrations + updated changes.rst