Merge remote-tracking branch 'niels/simulator-wip'
Merge branch 'master' of https://github.com/fnoble/piksi_firmware
Merge remote-tracking branch 'niels/master'
Change reading NAP git hash from configuration flash to reading version
string
Merge branch 'master' of github.com:cbeighley/piksi_firmware
NAP: Check for old style version and fall back if necessary