disorder in sdiffs

fixes swift-nav/piksi_firmware#90, 'disorder in sdiffs'

<!---
@huboard:{"order":64.0,"milestone_order":51,"custom_state":""}
-->