Merge branch 'master' of /home/bam/Projects/scape-audio-qa with conflicts.
Add new hadoop job + minor edits