Merge pull request #39 from docfaraday/multistream_unit_tests

Uncomment test code, and frob some config on our parse. Test crashes
Adding attributes, other stuff
Merge pull request #40 from martinthomson/sdpwrap

Adding attributes, other stuff