Merge branch 'master' of https://github.com/worklist/hifi
name the current domain server
merge
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
hacking on voxel geometry shader
inital setup for static assignment mapped file
adding measured angular velocity to faceshift
Merge remote-tracking branch 'upstream/master'
Renaming for clarity.
Merge branch 'master' of https://github.com/worklist/hifi into grower
Merge branch 'master' of github.com:worklist/hifi into assignment
handle unmapping of assignment file on SIGTERM, add created to static map
Enlarge heads when they're moused over.
Merge pull request #982 from ey6es/grower

Enlarge heads when they're moused over.
rearranged menus, some hacking on voxel shader
decouple DS from main, move to C++11
Pupil dilation.
some refactoring for DS, add create assignments to file
Merge branch 'master' of https://github.com/worklist/hifi