simplify logic, correcting initial refresh to work
simplify wheel zoom logic hopefully correcting some user's problems, handle non-querty keyboard zoom
Merge pull request #125 from seandepagnier/optimum-merging

Optimum merging