update emitter version and fix some NPEs
Merge branch 'master' of github.com:metamx/druid

Conflicts:
	client/src/main/java/com/metamx/druid/QueryableNode.java
	server/src/main/java/com/metamx/druid/http/ComputeNode.java