Big Cleanup
Merge branch 'master' of https://github.com/RobbyWauters/MediaGoo