fix documentation of clumpTemplate in utils.py
Merge remote branch 'upstream/master'
let replaceByClumps return a list of tuples with new clump ids and associated sphere ids
Merge remote branch 'upstream/master'
Merge pull request #34 from jakob-ifgt/master

doc fix and small change in replaceByClumps method