Merge pull request #113 from guillermo-carrasco/master

Add support for memory benchmarking
specific test for bowtie2, does not find the ref yet as it did with bowtie1, strange
with statement compatible with python 2.6.6
Correct new syntax to reference bowtie2 indexes within fastq_screen
Skip bowtie2 tests on travis since bowtie2 indexes are hard to find publickl
@guillermo-carrasco, memory_profiler 0.31 is already on PyPi, good job
Adding psutil, thanks @guillermo-carrasco
Merge pull request #114 from brainstorm/master

Bowtie2 site-specific tweaks for fastq_screen with Bowtie2
Ensure cleanup of bowtie1 vs bowtie2 results, fastq_screen has the same output result files
Refactoring auxiliary function
Merge pull request #115 from brainstorm/master

Add an extra cleanup at the end of the test, bowtie1 results got overriden by bowtie2
Self on local function for deleting intermediate results... :-/
Merge branch 'master' of https://github.com/brainstorm/facs
Merge branch 'master' of https://github.com/SciLifeLab/facs
Adding provenance JSON attributes for bowtie1 and bowtie2 in fastq_screen
Put simNGS generation back in the Makefile
Merge pull request #116 from brainstorm/master

Add bowtie version metadata to JSON reports
Merge branch 'master' of https://github.com/SciLifeLab/facs