Merge branch 'master' of git.shadowcat.co.uk:Oyster

diff --combined lib/Oyster/Provision/AmazonEC2.pm
index 4ccd509,12c003b..e54d902
--- 1/lib/Oyster/Provision/AmazonEC2.pm
--- 2/lib/Oyster/Provision/AmazonEC2.pm
+++ b/lib/Oyster/Provision/AmazonEC2.pm
@@@ -1,17 -1,14 +1,15 @@@
  package Oyster::Provision::AmazonEC2;
 +use Carp;
  use Moose::Role;
  use Net::Amazon::EC2;
  
  requires 'config';
  
  has 'api_username' => ( is => 'ro', isa => 'Str', required => 1, default => sub {
-     return "AKIAJXSD25MPWFYTQWIQ";
-     confess "Need api_username";
+     die "Need api_username";
  });
  has 'api_password' => ( is => 'ro', isa => 'Str', required => 1, default => sub {
-     return "m76s9DyoXrHdpVy8HkhjgD0RAjy14bhkQ5Zts/gg";
-     confess "Need api_password";
+     die "Need api_password";
  });
  
  has ec2_oyster_key => (is => 'rw', isa => 'Str', default => "OysterDefault");
@@@ -42,7 -39,7 +40,7 @@@ sub create 
     $self->config(); 
  
     # Start 1 new instance from AMI: ami-XXXXXXXX
 -   my $instance = $ec2->run_instances(
 +   my $instance = $self->ec2->run_instances(
         ImageId  => $self->image() or "ami-1a837773",
         KeyName  => $self->ec2_oyster_key,
         MinCount => 1,
@@@ -73,7 -70,7 +71,7 @@@ Oyster::Provision::AmazonEC2 -- Provisi
  
  =head1 SYNOPSIS
  
 -Use the Rackspace backend on your Oyster configuration file
 +Use the Amazon backend on your Oyster configuration file
  
  =head1 REQUIRED PARAMETERS