Merge pull request #432 from jrperritt/rs-keypair-fix

Rackspace keypair fix