Fixes datacenter and disk short options clashing
Fixes datacenter and disk short options clashing
Merge branch 'master' of github.com:sudorandom/softlayer-api-python-client
Merge pull request #253 from sudorandom/master

Fixes datacenter and disk short options clashing