Merge from upstream
Merge remote-tracking branch 'origin/master'
Added options for a couple of hardcoded file paths in datasets.py
Merge from upstream
Merge remote-tracking branch 'central/develop' into develop
Merge from upstream
Changed some tab characters to four spaces in runsizes.py
Made runsizes.py print out results to stdout when run with the --dry-run option
Merge remote-tracking branch 'central/develop' into develop
handlde old and new name versions of the same sample within the same project
added fastq.gz functionality
Merge pull request #116 from SciLifeLab/develop

Develop
HotFix: Package data locations have changed for rst templates apparently
Merge pull request #117 from brainstorm/master

Package data templates rst
Add templates search path
Merge pull request #118 from percyfal/master

Hotfix - add more template paths
Correct template wildcard
Set template wildcard to *.mako
Merge pull request #119 from percyfal/master

Hotfix - update template install wildcard
Merge branch 'develop' of git://github.com/SciLifeLab/scilifelab into develop