Merge pull request #113 from mshamash/master

More work on airport info + linking
Avoiding merge conflicts.
Merge pull request #11 from stephandev/master

Avoiding merge conflicts.