Adds c3.xlarge type to rest instances
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Rename deployment properties file back to usergrid-deployment.properties as it was in UG1.