Fix up reboot logic
Better error handling instructions
Merge branch 'master' of github.com:PX4/Firmware