merlin.cfg: Reorder sections.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
merlin.cfg: Add Twilio.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
Core/maps: Add Twilio smsmode.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
!sms: Add Twilio.

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

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 40a77278f3f2f563a991c3f83713c6c490515897)
!call: New module to call users using Twilio.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit b7443618a82044608df502c00d01180edf60cb87)
README.md: Add Twilio information.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
README: Add instruction to install twilio-python library. Fixed typo.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 71096766e013c2aabf1186ccecfbf330da291e8e)
Updated to latest yowsup.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
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>
Merge branch 'master' into legacy-stable