Merge pull request #2 from overra/master

Add video trimming options
use conditionals so they blend less
changelog
Merge pull request #2 from visionmedia/master

pulling in tj's changes