cleanup on controllers and views, twilio gets its own
Merge branch 'js/dev'