Maccxxi

Dropped one database to import the other. Installing a few plugins again is so much less hassle than trying to merge two sites.