Merge pull request #9 from mlund/master

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

Conflicts:
	src/examples/stockmayer.run
Minor
Update
NN
Simplifications
Nothing major only minor
Reconstruction and volume update
Diel-constant update
Diel-const again
NNN
Review
minor dh optimization
fixed debyehuckelshifted approximate force
New review
update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/faunus/analysis.h
	include/faunus/io.h
	src/examples/water.cpp
removed diel calc. from examples
added new nemo example