Merge pull request #1 from aaronr/master

Merging from Master
Merge remote-tracking branch 'upstream/master'
Fix satellite number.  The data is not XORed so removing the xor gives the correct value
Now gets fix type data from flytrex logger
Merge pull request #7 from lesserj/master

Update flytrex data unpacking