Fix Rhino VM (DATASET-1025)
Update joyent and wip
Merge branch 'joyent/feature/miscfix/2013Q4' into joyent/release/2013Q4