More compile fixes.
Compiles and links.
Merge pull request #23 from martinthomson/sdp_stub

As below
Fix merge conflicts (hopefully)
Let's fix this typo rather than comment it out.
Merge pull request #26 from adamroach/multistream

Let's fix this typo rather than comment it out.
Correcting types
Unfcking types a little
Fixing up stuff
Moving stuff around