misc fixup work
Merge branch 'master' of https://github.com/fire/ES_Downloader
Upstream czmq has removed the inline msvc2012 error.
fixing what I can
misc
learning some ruby
more fixes
Merge branch 'master' of https://github.com/TTimo/ES_Downloader

Conflicts:
	es_downloader.rb