Merge pull request #1 from wfunction/master

(Mostly-automated) code clean-up
Merge branch 'master' of github.com:gsabran/SOTA
Lat/Lon is wrong for Luxembourg!