Old changes from laptop (in the field?)
Merge branch 'master' of github.com:andybarry/flight