Semi auto lift

Merge in minor CB Robot Drive cleanup