Merge pull request #253 from sudorandom/master

Fixes datacenter and disk short options clashing