merlin.cfg: Reorder sections.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 931790b8ac81c07275fb016178754a7e194d930c)
merlin.cfg: Add Twilio.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit f7059237c4598f3691bb3c7dd860cb35b62caf52)
Core/maps: Add Twilio smsmode.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 772d8dfcbd5eb1b3afb0a186acbf9357c09cd1c9)
!sms: Add Twilio.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 5c11f64f5d8654022bdf5f5d48bd60b13f0d9fb2)
merlin.cfg: Add Twilio "warn" setting, reduce default timeout to 10 seconds.
Signed-off-by: Martin Stone <martin@d7415.co.uk>
!sms: One more chunk to allow Twilio smsmode.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
!call: New module to call users using Twilio.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
README.md: Add Twilio information.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 2f065573be981ca163ba35a4cc7f812059a04b17)
README: Add instruction to install twilio-python library. Fixed typo.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
Updated to latest yowsup.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit dd23796a33ac9743618e20d4e3182953cfb4ddd6)
excalibur: Don't use If-None-Match or If-Modified-Since on alt server (catch-up).

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit b719739f28aa7a7fa66772fc4975bd02dbec9013)
Merge branch 'acl' into acl-stable