Consolidate common.py media paths to fix #136

Getting rid of the extra media paths in common.py to make everything simpler. Unit tests pass, request_stream works. Minor code changes.