ibm and not softlayer
Merge pull request #852 from drozer/master

ibm and not softlayer