first attempt at upgrading to java 7
use JDK 7 and update xk connections to 1000
Merge commit 'HEAD@{2}' into HEAD

Conflicts:
	conf/clusters.yaml
	src/clj/backtype/storm/crate/zookeeper.clj
	src/clj/backtype/storm/node.clj
remove build artifact
Merge pull request #1 from shareaholic/shr-update

Shr update