Bug fixes
Much less intrusive BOSH transport implimentation
Less intrusive diff to main branch