Working on reorientation.
Merge branch 'master' of https://github.com/worklist/hifi
More work on righting based on gravity vector.
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
DRY up resource subdir copying for OS X bundle
Fixed threading issue with Environment, more work on avatar righting.
Restore "floor."
Merge pull request #388 from birarda/master

DRY up the resource copying
Merge branch 'master' of https://github.com/worklist/hifi
Fix the spacing, and while we're at it, change tabs to spaces.
Merge pull request #389 from ey6es/master

Fixed threading issue with Environment, some progress on orienting based on gravity (still a work in progress).
cleaned up some stuff
Merge remote-tracking branch 'upstream/master'
cleanups