twilio commented out, navbar home link
Merge branch 'staging' into twilio