Add aws support

Squashed commit of the following:

commit 0a54dff82e36e990770ee8afb35d97ba775187c3
Merge: 705edfc 1a625bf
Author: Grant McInnes <gmcinnes@marsdd.com>
Date:   Sun Apr 14 22:29:39 2013 -0400

    Merge branch 'master' into vagrant_aws

    Conflicts:
    	Vagrantfile

commit 705edfcbe1b47b6d9e8c931afab1aa355919e541
Author: Grant McInnes <gmcinnes@marsdd.com>
Date:   Sun Apr 14 22:28:45 2013 -0400

    Add a bit of documentation

commit 684f79fd4bdd1448155caa050d80ddd219538091
Author: Grant McInnes <gmcinnes@marsdd.com>
Date:   Sun Apr 14 21:24:14 2013 -0400

    Add support for ec2 vagranting