Cleanup makefile, dump stuff to s3