Add ec2 command line tools setup
Fix some errors in the setup scripts