Minor cleanups
Merge branch 'master' of https://github.com/tribal-tec/Equalizer

Conflicts:
	eq/server/config/resources.cpp