clean up settings-related files

mostly style, but also getting rid of a little cruft
Merge pull request #2597 from dimagi/cleanup-settings

clean up settings-related files