parser, maps: Parse the new "Total Amount of Resources From Ships Being Sold" item in planet scans.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 0c841dd35c562468909a0d8244fb79cb9fcd1dbe)
parser: Fix logic error related to catchup option.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 08e9a77cd952d6b6d79d72b681fa66ac01858ce0)
parser: PA Scan headers show the current planet (at page load, not scan time). Contents are from scan time.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 01a344a4f4d6d88ab29a48d14614a4d4a01e3950)
!pref: Add the "new" sms modes to usage text.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit f58b2a0a69ae6fb40cd25f08a9621df1b667e77d)
!pref, !sms, merlin.cfg: Better checks for whether an sms service is configured before allowing it to be set in !pref. Better error messages for bad smsmodes in !sms.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit d2343498038b68e47b7fbbaec4637bc4d569b39b)
Allow HTTPS in scan URLs.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit f4e7dcff4db6d059e0a8bdff74ace7d3c3325183)
Fix Arthur CSS

Fixed races, myplanet and defined colours in arthur css
(cherry picked from commit 4dbe50460f65fb6ef5db625fcb59b3fd859b002b by Patfeesh)

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 3b3806d1545f7c3b17790aebf62ab914cb415722)
Arthur: CSS Race colours from PA.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 1d0a98f884a64592ab7a564d4e94113de14222f1)
Arthur: Tone down some CSS colours.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 55e0d1f5f0ef8fcb1800c84e4cd18171d51e2268)
Core/messages: Partially revert 1ae273e140e5f88325b4152859c5af09785fd687, which was causing errors on whitespace-only messages.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit ed24fc2eea769dfe16b8a97dc9a2b2fc91c405f8)
Core/connection: Better queue handling on quit.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit c46b3dbe239b8141855a94dddaaff956966794ec)
Core/messages: New IRC parser.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit fa77d6fd6108c74a8e05e49de9b14cfad78e845c)
!prop: Ensure invite, kick and suggestion proposal IDs do not conflict.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 829f7fbf34ed3da81bacdf2775f40d9abf0b1aa4)
!prop: Fix new_prop_id() when no props exist.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 8c8ef276b9b943155f36ba8f0e3d5c1ff2b18e0d)
Core/messages: Hacky fix for NAMES / CUT.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit e604c5532277d0ab314818be46ac548f638fffb6)
walkthrough.md: Add logrotate setup.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit c4ec067a13e9e98dfd65878287b190dd0bfb5d0a)
New yowsup version.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit d941a96772160a7c4cb5ab1af6bdf731185403c7)
settings for #scans

Signed-off-by: Martin Stone <martin@d7415.co.uk>
Disabled more intel-based commands.

Signed-off-by: Martin Stone <martin@d7415.co.uk>
merlin.cfg: Options set to True *and* False. I need QC...

Signed-off-by: Martin Stone <martin@d7415.co.uk>