Merge pull request #7 from mlund/master

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

Conflicts:
	include/faunus/analysis.h
Merge pull request #8 from mlund/master

merge w. bjorn
Merge pull request #13 from bjornstenqvist/master

merge w. bjorn