Merge pull request #4 from bjornstenqvist/master

import from stenqvist (field and dipoles)
Added CATCH unittest framework and rewrote faunus unittest
Merge pull request #2 from mlund/master

upstream merge