Merge pull request #19 from yectep/ytdev

Datafeed mods for proximity
Merge pull request #20 from yectep/ytdev

Bugfixes from previous
Better aircraft matching