Merge pull request #32 from birarda/reorganize

some directory re-organization, DRYing up CMake stuff
remove a line to test git  folder reference
Merge pull request #33 from birarda/reorganize

moved MarkerNode from shared to voxel library
a few small fixes on the avatar springs
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #34 from birarda/reorganize

include the shared headers to the voxel library
Merge branch 'master' of https://github.com/worklist/hifi
add dependency to shared library from voxel library
Merge branch 'master' of github.com:worklist/hifi into reorganize