Add dropSoftDeletes method to migrations

Signed-off-by: Daniel Bondergaard <danielboendergaard@gmail.com>
Add a unique index to migration column
Fix conflicts.
Merge branch 'master' of github.com:laravel/framework