Merge pull request #610 from mweisman/master

Use correct wildcard for data.zip
Assign ami ip after setup