Merge pull request #88 from JamesBromberger/python

fix ec2 manifest and import
Merge pull request #89 from JamesBromberger/python

James done goofed :-)