various doc fixes - update can no longer be used to merge - short summary start with lowercase - add merge to short help list - fix tests

# should print nothing
# should print ? b/x
? b/x
# should print A b/x
A b/x
# should forget b/x
forgetting b/x
# should print nothing