disorder in sdiffs

fixes swift-nav/piksi_firmware#90, 'disorder in sdiffs'