Added try/catch around youtube/soundcloud parser
Merge remote-tracking branch 'origin/master'