refactor to use Flight (by Twitter)
Merge branch 'flight' into gh-pages