Refactoring management tests into 3 main categories based on what they query against.
organized rest IT
removed awscluster changes
Merge branch 'pr/77' into two-dot-o
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
Adds c3.xlarge instance config options
Removed invalid parent reference
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.
Removed exception swallowing on setup

Renamed CL properties
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
Need to specify something > Java 1.3 for SDK to work, now that it is not parented by the stack.
I was getting this error on Ubuntu with OpenJDK so I changed the apostrophe:
ElasticSearchTest.java:[80,51] error: unmappable character for encoding ASCII
remove add collections