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)
Updated polarization
Minor change in stockmayer.cpp
Added stockmayer.run
Updated induceDipoles
Updated induceDipoles
Merge branch 'master' of https://github.com/bjornstenqvist/faunus
Working polarizability
Added CATCH unittest framework and rewrote faunus unittest
Updated, working, polarization and induced dipoles. Implemented but not working calculation of dielectric constant.
Merge pull request #2 from mlund/master

upstream merge
Added function to iterate over pairs in a container
Merge branch 'master' of https://github.com/mlund/faunus
Templated various functions with taking `Space` as argument
Update move.h
Re-indented
Merge branch 'master' of https://github.com/bjornstenqvist/faunus into bjornstenqvist-master

Conflicts:
	include/faunus/analysis.h