Minor update, output matrix
Merge branch 'master' of https://github.com/bjornstenqvist/faunus

Conflicts:
	include/faunus/analysis.h