Great update, but I think that it would be good to have an option to use ctrl-scrollwheel for rotating and normal scrollwheel for zooming.
