lowered voxel count so Ryan can run, and handle too many voxels case slightly more gracefully than crashing
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
merge conflict fix
Merge pull request #251 from ZappoMan/render_voxels_optimization

Fix Ryan's render problem (hopefully) and don't crash with too many voxels