Update BMS definitions to 5/17/2013 changes
Continue merging abbrev BMS definitions