Tweaks to PR 490

Per https://github.com/rackspace/php-opencloud/pull/490#issuecomment-66283072 (copied below for quick reference):
> I'd like to make a couple of minor tweaks to this patch, including the necessary changes for the build to pass. I'm going to accept this PR in its current state and make the changes as part of a new PR.