fixing uploader
fixing uploader a bit more
fixing uploader a bit more again
fixing uploader a bit more again again
testing uploads
disable post processing
remove fog and use cloudinary for image processing and hosting
Fixed merge conflict
Merging to master
adding files from Matt's matts work