Fixup car batteries

Merge, style fixup (no tabs please), and an attempt at solving the problem where a fuel tank and a battery need to occupy the same square by adding a "small" vehicle component flag.  A better solution would be appreciated if someone can come up with one.