Reorganize
Merge branch 'master' of https://github.com/euclio/media-bugger