Merge branch 'origin'

Conflicts:
	pctb/TODO

diff --cc pctb/TODO
index 8088a10b854f8e9a96ceeaac9cf3c84cdfa20cc1,935554064b0ed54448b4ceb73b1e10299b9574d3..6a603c61c61989ea6b94a3042f3bc785a14fffdb
--- 1/pctb/TODO
--- 2/pctb/TODO
+++ b/pctb/TODO
@@@ -1,8 -1,11 +1,6 @@@
 -make dict char update able to only add to one of upper/lower so that
 -we can have
 -              upper           lower
 -                              in
 -              I  err
 -              Iron
 -  need to rethink all this
 -
 +add UI option to dictionary-manager to make user specify which dictionary
 +  to add multi-context entries to
 +install/test dictionary upload/approval
- onboard ship island name horizontal trim
  write real uploader
  test real uploader
- building island name extractor
- speed it up
+ further speedups