Updates for refactored media bundle
Merge pull request #7 from linestorm/media

Updates for refactored media bundle