nephoscale create machine refactoring
Fix ami get_ec2_amis script
Merge branch 'master' into keys