Update migrations to be compatible with Rails 4
Merge pull request #1136 from stephankaag/update_migrations_rails4

Update migrations to be compatible with Rails 4