Optimize initType() so that it does not check ES that a type has been initialized before attempting to create type.
Remove unused class.
Add support for c3.xlarge.
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.
Rename deployment properties file back to usergrid-deployment.properties as it was in UG1.
Default to Hector lock manager instead of single-node one.
Minor logging changes for notifications test.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Conflicts:
	stack/awscluster/src/main/dist/init_instance/init_rest_server.sh
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o