refactor expect_headers
Merge branch 'master' of github.com:brooklynDev/airborne