Fix style issues
Remove file url from media model test
Minor clean up
Check for test values
Check for test values
Fix a merge conflict
Add media.uploads to app folder
Ignore files in media.uploads
Remove original imagefly
Fix broken path
Minor edit to get imagefly path sorted
Fix broken test