Revert 79b4714..c87b93d

This rolls back to commit 79b471476372a717e8996b88a08d139c6f813a0b.
Fix migrations for PG on Heroku
Fix migration II
Merge branch 'Test'