2.1 config updates

Had to tweak some id conflicts caused by updating rotary craft