Revert "[aws|compute] tweaks for servers"

clientToken is returned by describe_instances, so it should be an
attribute
This reverts commit 7f48b10559.

lib/fog/aws/models/compute/server.rb

@@ -12,6 +12,7 @@ module Fog
         attribute :ami_launch_index,      :aliases => 'amiLaunchIndex'
         attribute :availability_zone,     :aliases => 'availabilityZone'
         attribute :block_device_mapping,  :aliases => 'blockDeviceMapping'
+        attribute :client_token,          :aliases => 'clientToken'
         attribute :dns_name,              :aliases => 'dnsName'
         attribute :groups
         attribute :flavor_id,             :aliases => 'instanceType'
@@ -33,7 +34,7 @@ module Fog
         attribute :subnet_id,             :aliases => 'subnetId'
         attribute :user_data
 
-        attr_accessor :client_token, :password, :username
+        attr_accessor :password, :username
         attr_writer   :private_key, :private_key_path, :public_key, :public_key_path
 
         def initialize(attributes={})

spec/aws/models/compute/server_spec.rb

@@ -23,6 +23,7 @@ describe 'Fog::AWS::Compute::Server' do
     it "should remap attributes from parser" do
       server = @servers.new({
         'amiLaunchIndex'    => 'ami_launch_index',
+        'clientToken'       => 'client_token',
         'dnsName'           => 'dns_name',
         'imageId'           => 'image_id',
         'instanceId'        => 'instance_id',
@@ -35,6 +36,7 @@ describe 'Fog::AWS::Compute::Server' do
         'ramdiskId'         => 'ramdisk_id'
       })
       server.ami_launch_index.should == 'ami_launch_index'
+      server.client_token.should == 'client_token'
       server.dns_name.should == 'dns_name'
       server.image_id.should == 'image_id'
       server.id.should == 'instance_id'