fixed a couple crashes and cleaned up some code
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
merge cleanup
Merge pull request #1051 from ZappoMan/keep_local_voxels

Clean up some crashes in client side handling of voxels