Merge pull request #2 from markormesher/master

merge
Merge pull request #3 from markormesher/master

merge
Merge pull request #4 from markormesher/master

Merge
Merge pull request #5 from markormesher/master

merge
add twilio to config
Merge pull request #10 from musalbas/master

merge