Merge pull request #15 from mlund/develop

Develop
Load function in DipoleAnalysis updated
Minor change fixed in water.cpp (DipoleAnalysis)
Load function in DipoleAnalysis updated
Further updates
Merge pull request #37 from bjornstenqvist/master

merge w. bjorn