merged from airlift 2.0 development
tidying up
testing cleanup
merge
ran latest integration tests
added header support to Airlift
fixed several issues with browser in integration tests