Merge pull request #3 from drscream/bugfix/logical-devs

Print warning and exit if we detect more than one removable device
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
Spaces, away
Merge remote-tracking branch 'upstream/master'

Conflicts:
	platform-upgrade