Merge pull request #1230 from ey6es/master

Partial orchidectomy: removed (some of) Jeffrey's balls.
Voxel click to fly is now an option in the Tools Menu
screen does not flash when voxels are clicked
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #1232 from PhilipRosedale/master

Voxel click to fly defaults OFF, in tools menu
Merge branch 'master' of https://github.com/worklist/hifi