Fixes:

* Syntax error on Amazon
* Incorrect AMI id on Ubuntu
Add t2 range of machines.