Added comments and cleaned up some of the conflicts

Added comments to the unit tests, as well as some of the spot specifiv
variables added in EC2Cloud and EC2Computer. Cleaned up some of the
minor conflicts in EC2Cloud/Computer and the tests.