Clean up a couple files and the uploads dir
Merge branch 'master' of https://github.com/thisishuey/frogban