Feature/joyent disk fix

This appears to work on both Ubuntu and CentOS images.