Modified rake task methods to account for change in model associations and inconsistent country names