Rebuild instance.url_name migration

The easiest way to resolve a migration collision when there are no
overlapping models is to simply rebuild one.
Merge branch 'master' of github.com:azavea/OTM2