Merge branch 'stable-3.x'

Conflicts:

	yarrg/TODO

diff --cc yarrg/TODO
index 8e85c933e1d1bd44204fb3df18771c9916d5c153,8fd392eed3e6326d355abb1f4aba3b501b487beb..101af03bd00313c27402dee10e56df66f4fcbd5b
--- 1/yarrg/TODO
--- 2/yarrg/TODO
+++ b/yarrg/TODO
@@@ -22,9 -25,36 +22,13 @@@ support Opal and Jade (currently there 
  WEBSITE
  -------
  
 -      trades for route with an archipelago should produce
 -        a message saying `searched for arbitrage trades only in
 -        Ruby' or some such.
 -
 -      multi-visit routes / circular routes
 -
 -      adjustable potential cost of losses (rather than fixed
 -              1e-BIG per league)
 -              use power formula (compound interest)
 -              suggest 0.5%
 -
 -      initial/final stocks feature
 -
 -      max volume/mass
 -
 -      max capital
 -
 -      better documentation
 -
 -      printable voyage trading plan
 -
 -
 -KEYLETTERS
 -----------
++trades for route with an archipelago should produce
++  a message saying `searched for arbitrage trades only in
++  Ruby' or some such.
+ 
 -P     needed before public release
 -O     needed before public release to support multiple oceans
 +allow unticking based on minimum margin or minimum profit
  
 -C     needs ypp client and network connection
 -N     needs network connection
 -W     needs to be done by someone with Windows
 +initial/final stocks feature
  
 -D     dependencies unsatisfied
 +query_routesearch should show capital for each voyage
 +query_routesearch should support ending in specific place(s)