Fixed various references - note that the integration test does not work (cannot join local Tomcat ES instance)
Merge branch 'hazelcast' of http://github.com/bcopy/elasticsearch-tomcat7-example into hazelcast

Conflicts:
	pom.xml
	src/test/java/org/github/est7example/HazelcastQueueRiverIT.java
Recovering from wrongful merge with hz 2.6 branch...