first cut at keeping local voxels
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels
progress on keep local voxels
progress on keep local voxels
progress on keep local voxels
remove dead code
Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels

Conflicts:
	interface/src/Menu.h
Merge pull request #1041 from ZappoMan/keep_local_voxels

Keep local voxels