Let's try this again.

Requests to EC2 return before the object is created, so interacting with (such
as adding tags) can fail. Add the tags at the point we know they are available.
Merge branches 'vagrant-test', 'centos-builder-FLOC-1024' and 'ec2-spot-tags' into staging