v_1.0.4
Merge branch 'master' of github.com:twitter/flight into version_1.0.4