some minor changes
Merge branch 'master' of https://github.com/marcjmcdougall/perspective
zooming in to 2D mode collides with items, some other minor changes