Squashed commit of the following:

commit 6e6ba8f345d3eb815362c47b809516c5d4bcd2a7
Author: EC2 Default User <ec2-user@ip-10-170-86-146.us-west-1.compute.internal>
Date:   Sun Feb 24 23:51:44 2013 +0000

    done