Merge pull request #1 from mlund/master

minor optimisation of dip-dip energy
Update diel-calculation
Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/faunus/multipole.h
Merge branch 'master' of https://github.com/bjornstenqvist/faunus
Merge pull request #4 from bjornstenqvist/master

import from stenqvist (field and dipoles)