got rid of a couple of old media bits
Merge branch 'master' of https://github.com/tqwhite/multiSite