commit before mere
Merge branch 'master' of github.com:SciLifeLab/facs
Merge pull request #100 from guillermo-carrasco/master

Some views + incorporation of awakening function
Remove fastq_screen result file just after processing it, no need to keep it @guillermo-carrasco #reviewthis
Merge branch 'master' of github.com:brainstorm/facs
Clean outside the context manager
Merge branch 'master' of github.com:SciLifeLab/facs
provide abs_path for query and filter in JSON report
Merge pull request #101 from tzcoolman/master

fix issue #98
Merge branch 'master' of https://github.com/SciLifeLab/facs
Normalize contamination rate for FACS, relax assert
Merge branch 'master' of github.com:brainstorm/facs
Explicit number of threads in a given run, should fix issue #99
Fixing @tzcoolman warnings in abspath and updating ipython notebook with correct contamination rates.
Correct contaminations for FACS/fastq_screen ipython notebook
Thread numbers should be collected from the parallell zone, fixes issue #99
Speedup execution of benchmarks, already generated simngs reads do not need to be regenerated. Solved OMP_NUM_THREADS in benchmarks by passing -P flag to nosetests (preserve environment variable) @guillermo-carrasco #reviewthis
Merge pull request #102 from brainstorm/master

Contamination rates for fastq_screen corrected
Merge branch 'master' of https://github.com/SciLifeLab/facs
Multithreading benchmarks for fastqscreen based on OpenMP environment variable