Merge pull request #412 from jrperritt/rs-servers-updates

More Rackspace servers updates