changed vpre to preset
changed vpre to preset
changed vpre to preset
Merge pull request #7 from 4ware/master

Updated parameters
Update README and bump version
add progress option for progress notifications from ffmpeg
put back accidentally removed whitespace
Merge pull request #8 from svoynow-lz/master

add support for progress option to provide a method on your model that will passed be notified of processing progress
Add progress hook in README and bump version

Thanks to @svoynow-lz
https://github.com/rheaton/carrierwave-video/pull/8
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/carrierwave/video/ffmpeg_options.rb