Getting started on media section
Doing m section stuff
Modifying gyp
Fixing stuff up a little more
Fixing include guard
Restoring ccsdp.h
Fix merge conflicts