Integrate Audio/Video into transport

Just some preliminary work to integrate Audio/Video
Merge branch 'master' of https://github.com/XorMasters/hackweek2014