Disorder

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

Format for Doxygen