Merge branch 'RSherman_LEX'

changes to config.xml—keep this new one in www, take the one named
out_config.xm_bak, move to the folder above www (delete the config.xml
that is there) and rename to config.xml.
Changes to context manager