Add system information to log (#261)
Merge review 183 by @srh @jdoliner (fix #261)
Merge branch 'next' into sam_84

Conflicts:
	src/clustering/administration/main/command_line.cc