changed media to has many through
testing formatting of media now
fixed tests and rebased
Merge pull request #146 from osulp/feature/Media

changed media to has many through