improve zooming functionallity for wheel and toolbar
use sse2 cflag rather than sse
Merge pull request #116 from seandepagnier/optimum-merging

Optimum merging -- a few more updates and corrections