updated the path to the included certificate to make sure we actually get it
Merge branch 'hotfix/cert-filename'
Merge branch 'hotfix/json_last_error'
Merge branch 'master' of github.com:twilio/OpenVBX
Merge pull request #239 from twilio/develop

Sunday Fix
Update CHANGELOG.markdown

Correcting the current version number in the changelog
Updated CodeIgniter to 2.1.4

- Also applied changes to OpenVBX core files to fix compatibility
- See https://github.com/twilio/OpenVBX/issues/258
Updated Twilio library to twilio-php/3.12.1
Fix mail_helper to use CodeIgniter email library

- Much better support for SMTP
Updated config file for newer CodeIgniter

- May cause issues for installations that are not being rewritten
- Installation-specific options should be saved in `-local.php` config files!
Merge branch 'master' into develop