Bring up to date with changes in master for options
Added the --rescale option argument
Added zoom option

Allows for ratio zooming, instead of just specifying the scale
Added support for the rescale argument

The rescale argument uses "estimated" zooming.