Combine the published_at and aasm_state migrations into one migration
Merge pull request #831 from theodi/bugfix-fix-broken-migrations

Combine the published_at and aasm_state migrations into one migration