config updates.
Merge branch 'master' of github.com:andybarry/flight