Merge pull request #28 from SciLifeLab/development

Development
Merge pull request #29 from alneberg/master

Qc amount calculation script should work for both aggregate qc processes and normal qc processes.
Merge branch 'master' of github.com:SciLifeLab/genologics
Merge pull request #33 from alneberg/master

Try to make development mergeable.