put README in right dir
Merge branch 'master' into zipfile-refactor