new options for trimming, mapping and macs
Merge branch 'master' of https://github.com/bioinf/biss2014-chipseq1