Removed some extraneaous files.
Updated migrations with the associations between the models.  From now
on new migrations will be added.