Delete commented-out options
Restore the old defaults

And get rid of old-brewflags. Fix some dependency code.
Add ability to individually override defaults