Bring the top level INI file up to date
Address rfkelly's nits

Passes flake8 and nose.  SHIP IT!