Merge pull request #1 from visionmedia/master

pulling in tj's changes
Added video trimming options
Updated definition of trimming options
Merge pull request #2 from overra/master

Add video trimming options