Get rid of no-longer-needed server flag.
Fix up attribs to make sure they will work properly with the new
wanted-attrs logic.
Update submodule ref
Merge pull request #13 from VictorLowther/pull-req-master-dccf04341e8a02b81a47fd321efe6c0256033410

+2
CB 2: Make all the things use wants-attrib for smart attribute injection. [8/8]