Final commit of the day. Uploader sorted, Rmagick / Imagemagick is being troublesome and I'm sleepy.
Removed 'unnecessary' files.