Updates to fix and functional tweaks to the nginx logs import script
Update dependencies.
Name all the mocha callback functions for easier debugging.
Merge remote-tracking branch 'origin/master' into beanstalk-logs

Conflicts:
	test/server/logging.js