Merge branch 'trinity'
bugfix in jobSubmission waitfor PBS section
bugfix in macs2
smokebox ubdated ChipseqSummary
Merge branch 'master' of github.com:allPowerde/ngsane
bugfix trinity commented out
trinity summary added
Merge remote-tracking branch 'upstream/master'

Conflicts:
	core/makeSummary.sh
Merge branch 'master' into trinity