Add box url for the AWS vagrant box and misc changes
Use grains to deploy states by role