Removes ec2 code

Squashed commit of the following:

commit 665da86635bf5a535eab7855fb13bbe4c3d7d580
Author: Simon Walker <s.r.walker101@googlemail.com>
Date:   Fri Feb 1 16:32:28 2013 +0000

    Removes ec2 code