Nothing minor
Merge branch 'master' of https://github.com/bjornstenqvist/faunus

Conflicts:
	src/examples/stockmayer.run
Minor