Updated pom, added consumer_timeout, and fixed access
added zkclient to pom
Merge branch 'master' of github.com:jirafe/flume-kafka

Conflicts:
	src/main/java/com/vipshop/flume/source/kafka/KafkaSource.java