a shitload of changes

Conflicts:
	concourse-server/src/main/java/org/cinchapi/concourse/server/ConcourseServer.java