Cleaned some code. Improved zooming.

Cleaned some code. Prevent zooming while shift key is down to mitigate
chrome's shift panning interfering with my zooming.