Merge pull request #32 from rackspace/cloud-servers-1

Epic refactoring to improve testability.