Minor fixes not worthy of individual pulls
Adds fixtures to setup.py
Adds --san option for ordering CCI's
Merge pull request #251 from CrackerJackMack/cci_san_disks

Adds --san option for ordering CCI's
Merge pull request #250 from CrackerJackMack/minor

Minor fixes not worthy of individual pulls
Explicitly installs tox on travis
Merge pull request #252 from sudorandom/master

Explicitly installs tox w/travis
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
Fixes CCI wait_for_transaction

Fixes wait_for_transaction to only block on transactions that pertain to the provisioning
or reloading of a CCI and not any of the child transactions such as setting up monitoring
or setting up VPN accounts, etc.
'
Cleaned up using lookup helper and cleaned up the logic
adds wait_for_ready() to CCI and updates CLI to use it
Adds more clarify on the pending flag
so english. much grammar. wow.
white space
Fix bug in wait_for_ready, add tests
Moves complicated tests to their own class and tests
missed some pep8 stuff