First pass at update for using euca2ools 3.1.x