fixed some twilio
fixed merge conflicts. ready for simons
fixed some merging errors and table for analytics