continue adding EC2 to our model
Merge branch 'master' of https://github.com/Fathalian/nestor