html ups
configuration stuff
Merge branch 'master' into bgps
BGPS fixes, removed a bunch of "settings" things
BGPS fixes
backup before "fixing" files
fixes!  they mostly worked
bugfixes in many rst files