Proper media_proxy routing.
Merge pull request #76 from abmargb/master

Proper media proxy routing