Merge git://github.com/mozilla/socialapi-demo
When needing audio and video, request both at the same time
Merge pull request #28 from Standard8/media

If needing both Audio & Video, only make one gUM request