errors added to output hash
Merge branch 'ffprobe' into testing
Merge branch 'testing'
minor fixes
#run returns hash
post_exec_hooks
filter_blackdetect
filter_blackdetect
Merge branch 'filter_blackdetect' into ffmpeg

Conflicts:
	lib/ffmpeg_wrapper/filters/blackdetect.rb
filter_concat returns array
FFmpeg#run supports flags
Merge branch 'filter_concat' into ffmpeg
rm specs, videos slowing scp down