Dockerfile cleanup; Updates to README