Merge pull request #1 from dwijnand/master

Fix rolling push with spot instances. Fixes netflix/asgard#435.