Merge branch 'dev'
Changed Twilio AUTH_TOKEN and made use of config file for sensitive info