rmformat detects CD-ROM as a removable media, use disklist -r instead
Clean up array / count handling.
Merge branch 'xen0l-master'

* xen0l-master:
  Clean up array / count handling.
  rmformat detects CD-ROM as a removable media, use disklist -r instead