Close Astoundify/campaignify#89
Update conflicts.