Better way of dealing with schema.rb conflicts

[fanpu]

When running make update, there will be conflicts with schema.rb whenever we add new migrations to Autolab as the user will also have run the migrations previously. There should be a more transparent way of dealing with this.