Updated device name from vda to sda (vda is for virtual machines, not the hypervisors disks!)
Merge branch 'master' into gh-pages