Fixes duplicated functions. Not sure where I introduced them...
Fixes zoom broken after rotation
Reverses zoom direction
Revert "Removed broken zoom controls"

This reverts commit e587327867f711b9ba012ddd5b7d1ed108e57d3b.
Revert "Revert "Removed broken zoom controls"" Reverting the revert, didn't fix what I thought it would

This reverts commit 01501becaa506155381c9bd5d2af3b018822635e.
Merge branch 'zoom'