- try to improve error reporting even when --log is specified
- remove extra prints
Merge branch 'master' of github.com:logstash/logstash

Conflicts:
	lib/logstash/logging.rb