Ec2 platform fixes

Fixes for SSH, cleaned up own commit to raise unless success.
Cleaned up URI escape for Amazon Linux as the platform variable is "amazon linux ami release 2013.09."