A little DRY'er, and extract script now writes zip files

![imgres](https://f.cloud.github.com/assets/235397/146868/a1cb08d6-7497-11e2-97d7-1f38a87e6875.jpeg)